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 |
|---|---|---|---|---|
<div className="setup__group">
<div className="setup__subtitle">
<Trans>install_settings_dns</Trans> | <mask> </div>
<mask> }
<mask> </div>
<mask> </div>
<mask> <div className="setup__desc">
<mask> <Trans>install_settings_interface_link</Trans>
<mask> <div className="mt-1">
<mask> <AddressList
<mask> interfaces={interfaces}
<mask> address={webIp}
<mask> port={webPort}
<mask> />
<mask> </div>
<mask> </div>
<mask> </div>
<mask> <div className="setup__group">
<mask> <div className="setup__subtitle">
</s> * client: validate form on load </s> remove <div className="col-4">
<div className="form-group">
<label>
<Trans>install_settings_port</Trans>
</label>
<Field
name="web.port"
component={renderField}
type="number"
className="form-control"
placeholder="80"
validate={[port, required]}
normalize={toNumber}
onChange={handleChange}
</s> add <div className="setup__desc">
<Trans>install_settings_interface_link</Trans>
<div className="mt-1">
<AddressList
interfaces={interfaces}
address={webIp}
port={webPort} </s> remove </div>
</div>
<div className="setup__group">
<div className="setup__subtitle">
<Trans>install_settings_dns</Trans>
</div>
<div className="row">
<div className="col-8">
<div className="form-group">
<label>
<Trans>install_settings_listen</Trans>
</label>
<Field
name="dns.ip"
component="select"
className="form-control custom-select"
onChange={handleChange}
>
<option value={ALL_INTERFACES_IP}>
<Trans>install_settings_all_interfaces</Trans>
</option>
{renderInterfaces(interfaces)}
</Field>
</s> add <div className="row">
<div className="col-8">
<div className="form-group">
<label>
<Trans>install_settings_listen</Trans>
</label>
<Field
name="dns.ip"
component="select"
className="form-control custom-select"
onChange={handleChange}
>
<option value={ALL_INTERFACES_IP}>
<Trans>install_settings_all_interfaces</Trans>
</option>
{renderInterfaces(interfaces)}
</Field>
</div>
</div>
<div className="col-4">
<div className="form-group">
<label>
<Trans>install_settings_port</Trans>
</label>
<Field
name="dns.port"
component={renderField}
type="number"
className="form-control"
placeholder="80"
validate={[port, required]}
normalize={toNumber}
onChange={handleChange}
/>
</div>
</div>
<div className="col-12">
{dnsStatus &&
<div className="setup__error text-danger">
{dnsStatus}
{isDnsFixAvailable &&
<button
type="button"
className="btn btn-secondary btn-sm ml-2"
onClick={() => handleAutofix('dns', dnsIp, dnsPort)}
>
<Trans>fix</Trans>
</button>
}
</div>
} </s> remove <div className="col-12">
{webStatus &&
<div className="setup__error text-danger">
{webStatus}
{isWebFixAvailable &&
<button
type="button"
className="btn btn-secondary btn-sm ml-2"
onClick={() => handleAutofix('web', webIp, webPort)}
>
<Trans>fix</Trans>
</button>
}
</div>
}
</div>
</s> add </s> remove <div className="setup__desc">
<Trans>install_settings_dns_desc</Trans>
<div className="mt-1">
<AddressList
interfaces={interfaces}
address={dnsIp}
port={dnsPort}
isDns={true}
/>
</div>
</div>
</div>
<Controls invalid={invalid} />
</form>
);
};
</s> add <Controls invalid={invalid} />
</form>
);
}
} </s> remove <div className="col-12">
{dnsStatus &&
<div className="setup__error text-danger">
{dnsStatus}
{isDnsFixAvailable &&
<button
type="button"
className="btn btn-secondary btn-sm ml-2"
onClick={() => handleAutofix('dns', dnsIp, dnsPort)}
>
<Trans>fix</Trans>
</button>
}
</div>
}
</div>
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ceabad0fd07547dae7795bb827450883643aae31 | client/src/install/Setup/Settings.js |
<div className="row">
<div className="col-8">
<div className="form-group">
<label>
<Trans>install_settings_listen</Trans>
</label>
<Field
name="dns.ip"
component="select"
className="form-control custom-select"
onChange={handleChange}
>
<option value={ALL_INTERFACES_IP}>
<Trans>install_settings_all_interfaces</Trans>
</option>
{renderInterfaces(interfaces)}
</Field>
</div>
</div>
<div className="col-4">
<div className="form-group">
<label>
<Trans>install_settings_port</Trans>
</label>
<Field
name="dns.port"
component={renderField}
type="number"
className="form-control"
placeholder="80"
validate={[port, required]}
normalize={toNumber}
onChange={handleChange}
/>
</div>
</div>
<div className="col-12">
{dnsStatus &&
<div className="setup__error text-danger">
{dnsStatus}
{isDnsFixAvailable &&
<button
type="button"
className="btn btn-secondary btn-sm ml-2"
onClick={() => handleAutofix('dns', dnsIp, dnsPort)}
>
<Trans>fix</Trans>
</button>
}
</div>
} | <mask> address={webIp}
<mask> port={webPort}
<mask> />
<mask> </div>
<mask> </div>
<mask> </div>
<mask> <div className="setup__group">
<mask> <div className="setup__subtitle">
<mask> <Trans>install_settings_dns</Trans>
<mask> </div>
<mask> <div className="row">
<mask> <div className="col-8">
<mask> <div className="form-group">
<mask> <label>
<mask> <Trans>install_settings_listen</Trans>
<mask> </label>
<mask> <Field
<mask> name="dns.ip"
<mask> component="select"
<mask> className="form-control custom-select"
<mask> onChange={handleChange}
<mask> >
<mask> <option value={ALL_INTERFACES_IP}>
<mask> <Trans>install_settings_all_interfaces</Trans>
<mask> </option>
<mask> {renderInterfaces(interfaces)}
<mask> </Field>
<mask> </div>
<mask> </div>
<mask> <div className="col-4">
<mask> <div className="form-group">
<mask> <label>
</s> * client: validate form on load </s> remove return (
<form className="setup__step" onSubmit={handleSubmit}>
<div className="setup__group">
<div className="setup__subtitle">
<Trans>install_settings_title</Trans>
</div>
<div className="row">
<div className="col-8">
<div className="form-group">
<label>
<Trans>install_settings_listen</Trans>
</label>
<Field
name="web.ip"
component="select"
className="form-control custom-select"
onChange={handleChange}
>
<option value={ALL_INTERFACES_IP}>
<Trans>install_settings_all_interfaces</Trans>
</option>
{renderInterfaces(interfaces)}
</Field>
</s> add this.props.validateForm({
web,
dns,
});
}
render() {
const {
handleSubmit,
handleChange,
handleAutofix,
webIp,
webPort,
dnsIp,
dnsPort,
interfaces,
invalid,
config,
} = this.props;
const {
status: webStatus,
can_autofix: isWebFixAvailable,
} = config.web;
const {
status: dnsStatus,
can_autofix: isDnsFixAvailable,
} = config.dns;
return (
<form className="setup__step" onSubmit={handleSubmit}>
<div className="setup__group">
<div className="setup__subtitle">
<Trans>install_settings_title</Trans>
</div>
<div className="row">
<div className="col-8">
<div className="form-group">
<label>
<Trans>install_settings_listen</Trans>
</label>
<Field
name="web.ip"
component="select"
className="form-control custom-select"
onChange={handleChange}
>
<option value={ALL_INTERFACES_IP}>
<Trans>install_settings_all_interfaces</Trans>
</option>
{renderInterfaces(interfaces)}
</Field>
</div>
</div>
<div className="col-4">
<div className="form-group">
<label>
<Trans>install_settings_port</Trans>
</label>
<Field
name="web.port"
component={renderField}
type="number"
className="form-control"
placeholder="80"
validate={[port, required]}
normalize={toNumber}
onChange={handleChange}
/>
</div>
</div>
<div className="col-12">
{webStatus &&
<div className="setup__error text-danger">
{webStatus}
{isWebFixAvailable &&
<button
type="button"
className="btn btn-secondary btn-sm ml-2"
onClick={() => handleAutofix('web', webIp, webPort)}
>
<Trans>fix</Trans>
</button>
}
</div>
} </s> remove <div className="col-4">
<div className="form-group">
<label>
<Trans>install_settings_port</Trans>
</label>
<Field
name="web.port"
component={renderField}
type="number"
className="form-control"
placeholder="80"
validate={[port, required]}
normalize={toNumber}
onChange={handleChange}
</s> add <div className="setup__desc">
<Trans>install_settings_interface_link</Trans>
<div className="mt-1">
<AddressList
interfaces={interfaces}
address={webIp}
port={webPort} </s> remove <div className="setup__desc">
<Trans>install_settings_interface_link</Trans>
<div className="mt-1">
<AddressList
interfaces={interfaces}
address={webIp}
port={webPort}
/>
</s> add <div className="setup__group">
<div className="setup__subtitle">
<Trans>install_settings_dns</Trans> </s> remove <div className="col-4">
<div className="form-group">
<label>
<Trans>install_settings_port</Trans>
</label>
<Field
name="dns.port"
component={renderField}
type="number"
className="form-control"
placeholder="80"
validate={[port, required]}
normalize={toNumber}
onChange={handleChange}
</s> add <div className="setup__desc">
<Trans>install_settings_dns_desc</Trans>
<div className="mt-1">
<AddressList
interfaces={interfaces}
address={dnsIp}
port={dnsPort}
isDns={true} </s> remove <div className="col-12">
{dnsStatus &&
<div className="setup__error text-danger">
{dnsStatus}
{isDnsFixAvailable &&
<button
type="button"
className="btn btn-secondary btn-sm ml-2"
onClick={() => handleAutofix('dns', dnsIp, dnsPort)}
>
<Trans>fix</Trans>
</button>
}
</div>
}
</div>
</s> add | [
"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/ceabad0fd07547dae7795bb827450883643aae31 | client/src/install/Setup/Settings.js |
<div className="setup__desc">
<Trans>install_settings_dns_desc</Trans>
<div className="mt-1">
<AddressList
interfaces={interfaces}
address={dnsIp}
port={dnsPort}
isDns={true} | <mask> {renderInterfaces(interfaces)}
<mask> </Field>
<mask> </div>
<mask> </div>
<mask> <div className="col-4">
<mask> <div className="form-group">
<mask> <label>
<mask> <Trans>install_settings_port</Trans>
<mask> </label>
<mask> <Field
<mask> name="dns.port"
<mask> component={renderField}
<mask> type="number"
<mask> className="form-control"
<mask> placeholder="80"
<mask> validate={[port, required]}
<mask> normalize={toNumber}
<mask> onChange={handleChange}
<mask> />
<mask> </div>
<mask> </div>
<mask> <div className="col-12">
<mask> {dnsStatus &&
</s> * client: validate form on load </s> remove <div className="col-4">
<div className="form-group">
<label>
<Trans>install_settings_port</Trans>
</label>
<Field
name="web.port"
component={renderField}
type="number"
className="form-control"
placeholder="80"
validate={[port, required]}
normalize={toNumber}
onChange={handleChange}
</s> add <div className="setup__desc">
<Trans>install_settings_interface_link</Trans>
<div className="mt-1">
<AddressList
interfaces={interfaces}
address={webIp}
port={webPort} </s> remove </div>
</div>
<div className="setup__group">
<div className="setup__subtitle">
<Trans>install_settings_dns</Trans>
</div>
<div className="row">
<div className="col-8">
<div className="form-group">
<label>
<Trans>install_settings_listen</Trans>
</label>
<Field
name="dns.ip"
component="select"
className="form-control custom-select"
onChange={handleChange}
>
<option value={ALL_INTERFACES_IP}>
<Trans>install_settings_all_interfaces</Trans>
</option>
{renderInterfaces(interfaces)}
</Field>
</s> add <div className="row">
<div className="col-8">
<div className="form-group">
<label>
<Trans>install_settings_listen</Trans>
</label>
<Field
name="dns.ip"
component="select"
className="form-control custom-select"
onChange={handleChange}
>
<option value={ALL_INTERFACES_IP}>
<Trans>install_settings_all_interfaces</Trans>
</option>
{renderInterfaces(interfaces)}
</Field>
</div>
</div>
<div className="col-4">
<div className="form-group">
<label>
<Trans>install_settings_port</Trans>
</label>
<Field
name="dns.port"
component={renderField}
type="number"
className="form-control"
placeholder="80"
validate={[port, required]}
normalize={toNumber}
onChange={handleChange}
/>
</div>
</div>
<div className="col-12">
{dnsStatus &&
<div className="setup__error text-danger">
{dnsStatus}
{isDnsFixAvailable &&
<button
type="button"
className="btn btn-secondary btn-sm ml-2"
onClick={() => handleAutofix('dns', dnsIp, dnsPort)}
>
<Trans>fix</Trans>
</button>
}
</div>
} </s> remove return (
<form className="setup__step" onSubmit={handleSubmit}>
<div className="setup__group">
<div className="setup__subtitle">
<Trans>install_settings_title</Trans>
</div>
<div className="row">
<div className="col-8">
<div className="form-group">
<label>
<Trans>install_settings_listen</Trans>
</label>
<Field
name="web.ip"
component="select"
className="form-control custom-select"
onChange={handleChange}
>
<option value={ALL_INTERFACES_IP}>
<Trans>install_settings_all_interfaces</Trans>
</option>
{renderInterfaces(interfaces)}
</Field>
</s> add this.props.validateForm({
web,
dns,
});
}
render() {
const {
handleSubmit,
handleChange,
handleAutofix,
webIp,
webPort,
dnsIp,
dnsPort,
interfaces,
invalid,
config,
} = this.props;
const {
status: webStatus,
can_autofix: isWebFixAvailable,
} = config.web;
const {
status: dnsStatus,
can_autofix: isDnsFixAvailable,
} = config.dns;
return (
<form className="setup__step" onSubmit={handleSubmit}>
<div className="setup__group">
<div className="setup__subtitle">
<Trans>install_settings_title</Trans>
</div>
<div className="row">
<div className="col-8">
<div className="form-group">
<label>
<Trans>install_settings_listen</Trans>
</label>
<Field
name="web.ip"
component="select"
className="form-control custom-select"
onChange={handleChange}
>
<option value={ALL_INTERFACES_IP}>
<Trans>install_settings_all_interfaces</Trans>
</option>
{renderInterfaces(interfaces)}
</Field>
</div>
</div>
<div className="col-4">
<div className="form-group">
<label>
<Trans>install_settings_port</Trans>
</label>
<Field
name="web.port"
component={renderField}
type="number"
className="form-control"
placeholder="80"
validate={[port, required]}
normalize={toNumber}
onChange={handleChange}
/>
</div>
</div>
<div className="col-12">
{webStatus &&
<div className="setup__error text-danger">
{webStatus}
{isWebFixAvailable &&
<button
type="button"
className="btn btn-secondary btn-sm ml-2"
onClick={() => handleAutofix('web', webIp, webPort)}
>
<Trans>fix</Trans>
</button>
}
</div>
} </s> remove <div className="col-12">
{dnsStatus &&
<div className="setup__error text-danger">
{dnsStatus}
{isDnsFixAvailable &&
<button
type="button"
className="btn btn-secondary btn-sm ml-2"
onClick={() => handleAutofix('dns', dnsIp, dnsPort)}
>
<Trans>fix</Trans>
</button>
}
</div>
}
</div>
</s> add </s> remove <div className="col-12">
{webStatus &&
<div className="setup__error text-danger">
{webStatus}
{isWebFixAvailable &&
<button
type="button"
className="btn btn-secondary btn-sm ml-2"
onClick={() => handleAutofix('web', webIp, webPort)}
>
<Trans>fix</Trans>
</button>
}
</div>
}
</div>
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ceabad0fd07547dae7795bb827450883643aae31 | client/src/install/Setup/Settings.js |
<mask> onChange={handleChange}
<mask> />
<mask> </div>
<mask> </div>
<mask> <div className="col-12">
<mask> {dnsStatus &&
<mask> <div className="setup__error text-danger">
<mask> {dnsStatus}
<mask> {isDnsFixAvailable &&
<mask> <button
<mask> type="button"
<mask> className="btn btn-secondary btn-sm ml-2"
<mask> onClick={() => handleAutofix('dns', dnsIp, dnsPort)}
<mask> >
<mask> <Trans>fix</Trans>
<mask> </button>
<mask> }
<mask> </div>
<mask> }
<mask> </div>
<mask> </div>
<mask> <div className="setup__desc">
<mask> <Trans>install_settings_dns_desc</Trans>
<mask> <div className="mt-1">
<mask> <AddressList
</s> * client: validate form on load </s> remove <div className="col-12">
{webStatus &&
<div className="setup__error text-danger">
{webStatus}
{isWebFixAvailable &&
<button
type="button"
className="btn btn-secondary btn-sm ml-2"
onClick={() => handleAutofix('web', webIp, webPort)}
>
<Trans>fix</Trans>
</button>
}
</div>
}
</div>
</s> add </s> remove </div>
</div>
<div className="setup__group">
<div className="setup__subtitle">
<Trans>install_settings_dns</Trans>
</div>
<div className="row">
<div className="col-8">
<div className="form-group">
<label>
<Trans>install_settings_listen</Trans>
</label>
<Field
name="dns.ip"
component="select"
className="form-control custom-select"
onChange={handleChange}
>
<option value={ALL_INTERFACES_IP}>
<Trans>install_settings_all_interfaces</Trans>
</option>
{renderInterfaces(interfaces)}
</Field>
</s> add <div className="row">
<div className="col-8">
<div className="form-group">
<label>
<Trans>install_settings_listen</Trans>
</label>
<Field
name="dns.ip"
component="select"
className="form-control custom-select"
onChange={handleChange}
>
<option value={ALL_INTERFACES_IP}>
<Trans>install_settings_all_interfaces</Trans>
</option>
{renderInterfaces(interfaces)}
</Field>
</div>
</div>
<div className="col-4">
<div className="form-group">
<label>
<Trans>install_settings_port</Trans>
</label>
<Field
name="dns.port"
component={renderField}
type="number"
className="form-control"
placeholder="80"
validate={[port, required]}
normalize={toNumber}
onChange={handleChange}
/>
</div>
</div>
<div className="col-12">
{dnsStatus &&
<div className="setup__error text-danger">
{dnsStatus}
{isDnsFixAvailable &&
<button
type="button"
className="btn btn-secondary btn-sm ml-2"
onClick={() => handleAutofix('dns', dnsIp, dnsPort)}
>
<Trans>fix</Trans>
</button>
}
</div>
} </s> remove return (
<form className="setup__step" onSubmit={handleSubmit}>
<div className="setup__group">
<div className="setup__subtitle">
<Trans>install_settings_title</Trans>
</div>
<div className="row">
<div className="col-8">
<div className="form-group">
<label>
<Trans>install_settings_listen</Trans>
</label>
<Field
name="web.ip"
component="select"
className="form-control custom-select"
onChange={handleChange}
>
<option value={ALL_INTERFACES_IP}>
<Trans>install_settings_all_interfaces</Trans>
</option>
{renderInterfaces(interfaces)}
</Field>
</s> add this.props.validateForm({
web,
dns,
});
}
render() {
const {
handleSubmit,
handleChange,
handleAutofix,
webIp,
webPort,
dnsIp,
dnsPort,
interfaces,
invalid,
config,
} = this.props;
const {
status: webStatus,
can_autofix: isWebFixAvailable,
} = config.web;
const {
status: dnsStatus,
can_autofix: isDnsFixAvailable,
} = config.dns;
return (
<form className="setup__step" onSubmit={handleSubmit}>
<div className="setup__group">
<div className="setup__subtitle">
<Trans>install_settings_title</Trans>
</div>
<div className="row">
<div className="col-8">
<div className="form-group">
<label>
<Trans>install_settings_listen</Trans>
</label>
<Field
name="web.ip"
component="select"
className="form-control custom-select"
onChange={handleChange}
>
<option value={ALL_INTERFACES_IP}>
<Trans>install_settings_all_interfaces</Trans>
</option>
{renderInterfaces(interfaces)}
</Field>
</div>
</div>
<div className="col-4">
<div className="form-group">
<label>
<Trans>install_settings_port</Trans>
</label>
<Field
name="web.port"
component={renderField}
type="number"
className="form-control"
placeholder="80"
validate={[port, required]}
normalize={toNumber}
onChange={handleChange}
/>
</div>
</div>
<div className="col-12">
{webStatus &&
<div className="setup__error text-danger">
{webStatus}
{isWebFixAvailable &&
<button
type="button"
className="btn btn-secondary btn-sm ml-2"
onClick={() => handleAutofix('web', webIp, webPort)}
>
<Trans>fix</Trans>
</button>
}
</div>
} </s> remove <div className="col-4">
<div className="form-group">
<label>
<Trans>install_settings_port</Trans>
</label>
<Field
name="dns.port"
component={renderField}
type="number"
className="form-control"
placeholder="80"
validate={[port, required]}
normalize={toNumber}
onChange={handleChange}
</s> add <div className="setup__desc">
<Trans>install_settings_dns_desc</Trans>
<div className="mt-1">
<AddressList
interfaces={interfaces}
address={dnsIp}
port={dnsPort}
isDns={true} </s> remove <div className="setup__desc">
<Trans>install_settings_dns_desc</Trans>
<div className="mt-1">
<AddressList
interfaces={interfaces}
address={dnsIp}
port={dnsPort}
isDns={true}
/>
</div>
</div>
</div>
<Controls invalid={invalid} />
</form>
);
};
</s> add <Controls invalid={invalid} />
</form>
);
}
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ceabad0fd07547dae7795bb827450883643aae31 | client/src/install/Setup/Settings.js | |
<Controls invalid={invalid} />
</form>
);
}
} | <mask> </div>
<mask> }
<mask> </div>
<mask> </div>
<mask> <div className="setup__desc">
<mask> <Trans>install_settings_dns_desc</Trans>
<mask> <div className="mt-1">
<mask> <AddressList
<mask> interfaces={interfaces}
<mask> address={dnsIp}
<mask> port={dnsPort}
<mask> isDns={true}
<mask> />
<mask> </div>
<mask> </div>
<mask> </div>
<mask> <Controls invalid={invalid} />
<mask> </form>
<mask> );
<mask> };
<mask>
<mask> Settings.propTypes = {
<mask> handleSubmit: PropTypes.func.isRequired,
<mask> handleChange: PropTypes.func,
<mask> handleAutofix: PropTypes.func,
</s> * client: validate form on load </s> remove <div className="col-4">
<div className="form-group">
<label>
<Trans>install_settings_port</Trans>
</label>
<Field
name="dns.port"
component={renderField}
type="number"
className="form-control"
placeholder="80"
validate={[port, required]}
normalize={toNumber}
onChange={handleChange}
</s> add <div className="setup__desc">
<Trans>install_settings_dns_desc</Trans>
<div className="mt-1">
<AddressList
interfaces={interfaces}
address={dnsIp}
port={dnsPort}
isDns={true} </s> remove <div className="setup__desc">
<Trans>install_settings_interface_link</Trans>
<div className="mt-1">
<AddressList
interfaces={interfaces}
address={webIp}
port={webPort}
/>
</s> add <div className="setup__group">
<div className="setup__subtitle">
<Trans>install_settings_dns</Trans> </s> remove <div className="col-12">
{dnsStatus &&
<div className="setup__error text-danger">
{dnsStatus}
{isDnsFixAvailable &&
<button
type="button"
className="btn btn-secondary btn-sm ml-2"
onClick={() => handleAutofix('dns', dnsIp, dnsPort)}
>
<Trans>fix</Trans>
</button>
}
</div>
}
</div>
</s> add </s> remove <div className="col-12">
{webStatus &&
<div className="setup__error text-danger">
{webStatus}
{isWebFixAvailable &&
<button
type="button"
className="btn btn-secondary btn-sm ml-2"
onClick={() => handleAutofix('web', webIp, webPort)}
>
<Trans>fix</Trans>
</button>
}
</div>
}
</div>
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ceabad0fd07547dae7795bb827450883643aae31 | client/src/install/Setup/Settings.js |
validateForm: PropTypes.func, | <mask> handleChange: PropTypes.func,
<mask> handleAutofix: PropTypes.func,
<mask> webIp: PropTypes.string.isRequired,
<mask> dnsIp: PropTypes.string.isRequired,
<mask> config: PropTypes.object.isRequired,
<mask> webPort: PropTypes.oneOfType([
<mask> PropTypes.string,
<mask> PropTypes.number,
</s> * client: validate form on load </s> remove <div className="setup__desc">
<Trans>install_settings_dns_desc</Trans>
<div className="mt-1">
<AddressList
interfaces={interfaces}
address={dnsIp}
port={dnsPort}
isDns={true}
/>
</div>
</div>
</div>
<Controls invalid={invalid} />
</form>
);
};
</s> add <Controls invalid={invalid} />
</form>
);
}
} </s> remove ])(Settings);
</s> add ])(SettingsForm); </s> remove Settings = connect((state) => {
</s> add const SettingsForm = connect((state) => { </s> remove <div className="col-12">
{dnsStatus &&
<div className="setup__error text-danger">
{dnsStatus}
{isDnsFixAvailable &&
<button
type="button"
className="btn btn-secondary btn-sm ml-2"
onClick={() => handleAutofix('dns', dnsIp, dnsPort)}
>
<Trans>fix</Trans>
</button>
}
</div>
}
</div>
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ceabad0fd07547dae7795bb827450883643aae31 | client/src/install/Setup/Settings.js |
const SettingsForm = connect((state) => { | <mask> };
<mask>
<mask> const selector = formValueSelector('install');
<mask>
<mask> Settings = connect((state) => {
<mask> const webIp = selector(state, 'web.ip');
<mask> const webPort = selector(state, 'web.port');
<mask> const dnsIp = selector(state, 'dns.ip');
<mask> const dnsPort = selector(state, 'dns.port');
<mask>
</s> * client: validate form on load </s> remove let Settings = (props) => {
const {
handleSubmit,
handleChange,
handleAutofix,
webIp,
webPort,
dnsIp,
dnsPort,
interfaces,
invalid,
config,
} = props;
const {
status: webStatus,
can_autofix: isWebFixAvailable,
} = config.web;
const {
status: dnsStatus,
can_autofix: isDnsFixAvailable,
} = config.dns;
</s> add class Settings extends Component {
componentDidMount() {
const { web, dns } = this.props.config; </s> remove return (
<form className="setup__step" onSubmit={handleSubmit}>
<div className="setup__group">
<div className="setup__subtitle">
<Trans>install_settings_title</Trans>
</div>
<div className="row">
<div className="col-8">
<div className="form-group">
<label>
<Trans>install_settings_listen</Trans>
</label>
<Field
name="web.ip"
component="select"
className="form-control custom-select"
onChange={handleChange}
>
<option value={ALL_INTERFACES_IP}>
<Trans>install_settings_all_interfaces</Trans>
</option>
{renderInterfaces(interfaces)}
</Field>
</s> add this.props.validateForm({
web,
dns,
});
}
render() {
const {
handleSubmit,
handleChange,
handleAutofix,
webIp,
webPort,
dnsIp,
dnsPort,
interfaces,
invalid,
config,
} = this.props;
const {
status: webStatus,
can_autofix: isWebFixAvailable,
} = config.web;
const {
status: dnsStatus,
can_autofix: isDnsFixAvailable,
} = config.dns;
return (
<form className="setup__step" onSubmit={handleSubmit}>
<div className="setup__group">
<div className="setup__subtitle">
<Trans>install_settings_title</Trans>
</div>
<div className="row">
<div className="col-8">
<div className="form-group">
<label>
<Trans>install_settings_listen</Trans>
</label>
<Field
name="web.ip"
component="select"
className="form-control custom-select"
onChange={handleChange}
>
<option value={ALL_INTERFACES_IP}>
<Trans>install_settings_all_interfaces</Trans>
</option>
{renderInterfaces(interfaces)}
</Field>
</div>
</div>
<div className="col-4">
<div className="form-group">
<label>
<Trans>install_settings_port</Trans>
</label>
<Field
name="web.port"
component={renderField}
type="number"
className="form-control"
placeholder="80"
validate={[port, required]}
normalize={toNumber}
onChange={handleChange}
/>
</div>
</div>
<div className="col-12">
{webStatus &&
<div className="setup__error text-danger">
{webStatus}
{isWebFixAvailable &&
<button
type="button"
className="btn btn-secondary btn-sm ml-2"
onClick={() => handleAutofix('web', webIp, webPort)}
>
<Trans>fix</Trans>
</button>
}
</div>
} </s> remove <div className="setup__desc">
<Trans>install_settings_dns_desc</Trans>
<div className="mt-1">
<AddressList
interfaces={interfaces}
address={dnsIp}
port={dnsPort}
isDns={true}
/>
</div>
</div>
</div>
<Controls invalid={invalid} />
</form>
);
};
</s> add <Controls invalid={invalid} />
</form>
);
}
} </s> remove import React, { Fragment } from 'react';
</s> add import React, { Component, Fragment } from 'react'; </s> remove <div className="col-12">
{dnsStatus &&
<div className="setup__error text-danger">
{dnsStatus}
{isDnsFixAvailable &&
<button
type="button"
className="btn btn-secondary btn-sm ml-2"
onClick={() => handleAutofix('dns', dnsIp, dnsPort)}
>
<Trans>fix</Trans>
</button>
}
</div>
}
</div>
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ceabad0fd07547dae7795bb827450883643aae31 | client/src/install/Setup/Settings.js |
])(SettingsForm); | <mask> form: 'install',
<mask> destroyOnUnmount: false,
<mask> forceUnregisterOnUnmount: true,
<mask> }),
<mask> ])(Settings);
</s> * client: validate form on load </s> remove Settings = connect((state) => {
</s> add const SettingsForm = connect((state) => { </s> remove <div className="setup__desc">
<Trans>install_settings_dns_desc</Trans>
<div className="mt-1">
<AddressList
interfaces={interfaces}
address={dnsIp}
port={dnsPort}
isDns={true}
/>
</div>
</div>
</div>
<Controls invalid={invalid} />
</form>
);
};
</s> add <Controls invalid={invalid} />
</form>
);
}
} </s> remove <div className="col-12">
{dnsStatus &&
<div className="setup__error text-danger">
{dnsStatus}
{isDnsFixAvailable &&
<button
type="button"
className="btn btn-secondary btn-sm ml-2"
onClick={() => handleAutofix('dns', dnsIp, dnsPort)}
>
<Trans>fix</Trans>
</button>
}
</div>
}
</div>
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ceabad0fd07547dae7795bb827450883643aae31 | client/src/install/Setup/Settings.js |
validateForm={this.handleFormChange} | <mask> initialValues={config}
<mask> interfaces={interfaces}
<mask> onSubmit={this.nextStep}
<mask> onChange={this.handleFormChange}
<mask> handleAutofix={this.handleAutofix}
<mask> />
<mask> );
<mask> case 3:
<mask> return (
<mask> <Auth onSubmit={this.handleFormSubmit} />
</s> * client: validate form on load </s> remove <div className="setup__desc">
<Trans>install_settings_dns_desc</Trans>
<div className="mt-1">
<AddressList
interfaces={interfaces}
address={dnsIp}
port={dnsPort}
isDns={true}
/>
</div>
</div>
</div>
<Controls invalid={invalid} />
</form>
);
};
</s> add <Controls invalid={invalid} />
</form>
);
}
} </s> remove let Settings = (props) => {
const {
handleSubmit,
handleChange,
handleAutofix,
webIp,
webPort,
dnsIp,
dnsPort,
interfaces,
invalid,
config,
} = props;
const {
status: webStatus,
can_autofix: isWebFixAvailable,
} = config.web;
const {
status: dnsStatus,
can_autofix: isDnsFixAvailable,
} = config.dns;
</s> add class Settings extends Component {
componentDidMount() {
const { web, dns } = this.props.config; </s> remove return (
<form className="setup__step" onSubmit={handleSubmit}>
<div className="setup__group">
<div className="setup__subtitle">
<Trans>install_settings_title</Trans>
</div>
<div className="row">
<div className="col-8">
<div className="form-group">
<label>
<Trans>install_settings_listen</Trans>
</label>
<Field
name="web.ip"
component="select"
className="form-control custom-select"
onChange={handleChange}
>
<option value={ALL_INTERFACES_IP}>
<Trans>install_settings_all_interfaces</Trans>
</option>
{renderInterfaces(interfaces)}
</Field>
</s> add this.props.validateForm({
web,
dns,
});
}
render() {
const {
handleSubmit,
handleChange,
handleAutofix,
webIp,
webPort,
dnsIp,
dnsPort,
interfaces,
invalid,
config,
} = this.props;
const {
status: webStatus,
can_autofix: isWebFixAvailable,
} = config.web;
const {
status: dnsStatus,
can_autofix: isDnsFixAvailable,
} = config.dns;
return (
<form className="setup__step" onSubmit={handleSubmit}>
<div className="setup__group">
<div className="setup__subtitle">
<Trans>install_settings_title</Trans>
</div>
<div className="row">
<div className="col-8">
<div className="form-group">
<label>
<Trans>install_settings_listen</Trans>
</label>
<Field
name="web.ip"
component="select"
className="form-control custom-select"
onChange={handleChange}
>
<option value={ALL_INTERFACES_IP}>
<Trans>install_settings_all_interfaces</Trans>
</option>
{renderInterfaces(interfaces)}
</Field>
</div>
</div>
<div className="col-4">
<div className="form-group">
<label>
<Trans>install_settings_port</Trans>
</label>
<Field
name="web.port"
component={renderField}
type="number"
className="form-control"
placeholder="80"
validate={[port, required]}
normalize={toNumber}
onChange={handleChange}
/>
</div>
</div>
<div className="col-12">
{webStatus &&
<div className="setup__error text-danger">
{webStatus}
{isWebFixAvailable &&
<button
type="button"
className="btn btn-secondary btn-sm ml-2"
onClick={() => handleAutofix('web', webIp, webPort)}
>
<Trans>fix</Trans>
</button>
}
</div>
} </s> remove <div className="setup__desc">
<Trans>install_settings_interface_link</Trans>
<div className="mt-1">
<AddressList
interfaces={interfaces}
address={webIp}
port={webPort}
/>
</s> add <div className="setup__group">
<div className="setup__subtitle">
<Trans>install_settings_dns</Trans> </s> remove <div className="col-4">
<div className="form-group">
<label>
<Trans>install_settings_port</Trans>
</label>
<Field
name="web.port"
component={renderField}
type="number"
className="form-control"
placeholder="80"
validate={[port, required]}
normalize={toNumber}
onChange={handleChange}
</s> add <div className="setup__desc">
<Trans>install_settings_interface_link</Trans>
<div className="mt-1">
<AddressList
interfaces={interfaces}
address={webIp}
port={webPort} | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ceabad0fd07547dae7795bb827450883643aae31 | client/src/install/Setup/index.js |
"dns_settings": "DNS settings",
"encryption_settings": "Encryption settings",
"dhcp_settings": "DHCP settings",
"clients_settings": "Clients settings", | <mask> "no_settings": "No settings",
<mask> "general_settings": "General settings",
<mask> "upstream_dns": "Upstream DNS servers",
<mask> "upstream_dns_hint": "If you keep this field empty, AdGuard Home will use <a href='https:\/\/1.1.1.1\/' target='_blank'>Cloudflare DNS<\/a> as an upstream.",
<mask> "test_upstream_btn": "Test upstreams",
<mask> "apply_btn": "Apply",
</s> + client: split settings page into several pages </s> remove components={[<a href="https://letsencrypt.org/" key="0">link</a>]}
</s> add components={[
<a href="https://letsencrypt.org/" key="0">
link
</a>,
]} </s> remove <Card
title={t('clients_title')}
subtitle={t('clients_desc')}
bodyType="card-body box-body--settings"
>
<Fragment>
<ReactTable
data={clients || []}
columns={this.columns}
className="-striped -highlight card-table-overflow"
showPagination={true}
defaultPageSize={10}
minRows={5}
previousText={t('previous_btn')}
nextText={t('next_btn')}
loadingText={t('loading_table_status')}
pageText={t('page_table_footer_text')}
ofText={t('of_table_footer_text')}
rowsText={t('rows_table_footer_text')}
noDataText={t('clients_not_found')}
/>
<button
type="button"
className="btn btn-success btn-standard mt-3"
onClick={() => toggleClientModal(MODAL_TYPE.ADD)}
disabled={processingAdding}
>
<Trans>client_add</Trans>
</button>
<Modal
isModalOpen={isModalOpen}
modalType={modalType}
toggleClientModal={toggleClientModal}
currentClientData={currentClientData}
handleSubmit={this.handleSubmit}
processingAdding={processingAdding}
processingUpdating={processingUpdating}
/>
</Fragment>
</Card>
</s> add <Fragment>
<PageTitle title={t('clients_settings')} />
{!dashboard.processingTopStats || (!dashboard.processingClients && <Loading />)}
{!dashboard.processingTopStats && !dashboard.processingClients && (
<Fragment>
<ClientsTable
clients={dashboard.clients}
topStats={dashboard.topStats}
isModalOpen={clients.isModalOpen}
modalClientName={clients.modalClientName}
modalType={clients.modalType}
addClient={this.props.addClient}
updateClient={this.props.updateClient}
deleteClient={this.props.deleteClient}
toggleClientModal={this.props.toggleClientModal}
processingAdding={clients.processingAdding}
processingDeleting={clients.processingDeleting}
processingUpdating={clients.processingUpdating}
/>
<AutoClients
autoClients={dashboard.autoClients}
topStats={dashboard.topStats}
/>
</Fragment>
)}
</Fragment> </s> remove <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m14 2h-8a2 2 0 0 0 -2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2v-12z"/><path d="m14 2v6h6"/><path d="m16 13h-8"/><path d="m16 17h-8"/><path d="m10 9h-1-1"/></svg>
</s> add <svg className="nav-icon">
<use xlinkHref="#log" />
</svg> </s> remove <NavLink to="/guide" href="/guide" className="nav-link">
<svg className="nav-icon" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#66b574" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"><circle cx="12" cy="12" r="10"></circle><path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3"></path><line x1="12" y1="17" x2="12" y2="17"></line></svg>
</s> add <NavLink to="/guide" className="nav-link">
<svg className="nav-icon">
<use xlinkHref="#setup" />
</svg> | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/__locales/en.json |
import Dns from '../../containers/Dns';
import Encryption from '../../containers/Encryption';
import Dhcp from '../../containers/Dhcp';
import Clients from '../../containers/Clients';
| <mask> import Header from '../../containers/Header';
<mask> import Dashboard from '../../containers/Dashboard';
<mask> import Settings from '../../containers/Settings';
<mask> import Filters from '../../containers/Filters';
<mask> import Logs from '../../containers/Logs';
<mask> import SetupGuide from '../../containers/SetupGuide';
<mask> import Toasts from '../Toasts';
<mask> import Footer from '../ui/Footer';
</s> + client: split settings page into several pages </s> remove import Upstream from './Upstream';
import Dhcp from './Dhcp';
import Encryption from './Encryption';
import Clients from './Clients';
import AutoClients from './Clients/AutoClients';
import Access from './Access';
</s> add </s> remove import { MODAL_TYPE, CLIENT_ID } from '../../../helpers/constants';
import Card from '../../ui/Card';
import Modal from './Modal';
</s> add import ClientsTable from './ClientsTable';
import AutoClients from './AutoClients';
import PageTitle from '../../ui/PageTitle';
import Loading from '../../ui/Loading'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
import ReactTable from 'react-table';
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/App/index.js |
}; | <mask> };
<mask>
<mask> handleUpdate = () => {
<mask> this.props.getUpdate();
<mask> }
<mask>
<mask> setLanguage = () => {
<mask> const { processing, language } = this.props.dashboard;
<mask>
<mask> if (!processing) {
</s> + client: split settings page into several pages </s> remove }
</s> add }; </s> remove }
</s> add }; </s> remove }
</s> add }; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/App/index.js |
}; | <mask>
<mask> i18n.on('languageChanged', (lang) => {
<mask> this.props.changeLanguage(lang);
<mask> });
<mask> }
<mask>
<mask> render() {
<mask> const { dashboard, encryption } = this.props;
<mask> const updateAvailable =
<mask> !dashboard.processingVersions &&
</s> + client: split settings page into several pages </s> remove !dashboard.processingVersions &&
dashboard.isCoreRunning &&
dashboard.isUpdateAvailable;
</s> add !dashboard.processingVersions && dashboard.isCoreRunning && dashboard.isUpdateAvailable; </s> remove const {
t,
clients,
isModalOpen,
modalType,
modalClientName,
toggleClientModal,
processingAdding,
processingUpdating,
} = this.props;
const currentClientData = this.getClient(modalClientName, clients);
</s> add const { dashboard, clients, t } = this.props; </s> remove const {
settings, dashboard, clients, access, t,
} = this.props;
</s> add const { settings, t } = this.props; </s> remove }
</s> add }; </s> remove if (this.props.encryption.enabled) {
this.props.validateTlsConfig(this.props.encryption);
</s> add const { getTlsStatus, validateTlsConfig, encryption } = this.props;
getTlsStatus();
if (encryption.enabled) {
validateTlsConfig(encryption); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/App/index.js |
!dashboard.processingVersions && dashboard.isCoreRunning && dashboard.isUpdateAvailable; | <mask>
<mask> render() {
<mask> const { dashboard, encryption } = this.props;
<mask> const updateAvailable =
<mask> !dashboard.processingVersions &&
<mask> dashboard.isCoreRunning &&
<mask> dashboard.isUpdateAvailable;
<mask>
<mask> return (
<mask> <HashRouter hashType='noslash'>
<mask> <Fragment>
<mask> {updateAvailable &&
</s> + client: split settings page into several pages </s> remove }
</s> add }; </s> remove <HashRouter hashType='noslash'>
</s> add <HashRouter hashType="noslash"> </s> remove const {
settings, dashboard, clients, access, t,
} = this.props;
</s> add const { settings, t } = this.props; </s> remove const {
t,
clients,
isModalOpen,
modalType,
modalClientName,
toggleClientModal,
processingAdding,
processingUpdating,
} = this.props;
const currentClientData = this.getClient(modalClientName, clients);
</s> add const { dashboard, clients, t } = this.props; </s> remove {updateAvailable &&
</s> add {updateAvailable && ( | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/App/index.js |
<HashRouter hashType="noslash"> | <mask> dashboard.isCoreRunning &&
<mask> dashboard.isUpdateAvailable;
<mask>
<mask> return (
<mask> <HashRouter hashType='noslash'>
<mask> <Fragment>
<mask> {updateAvailable &&
<mask> <Fragment>
<mask> <UpdateTopline
<mask> url={dashboard.announcementUrl}
</s> + client: split settings page into several pages </s> remove {updateAvailable &&
</s> add {updateAvailable && ( </s> remove !dashboard.processingVersions &&
dashboard.isCoreRunning &&
dashboard.isUpdateAvailable;
</s> add !dashboard.processingVersions && dashboard.isCoreRunning && dashboard.isUpdateAvailable; </s> remove }
{!dashboard.processing && dashboard.isCoreRunning &&
</s> add )}
{!dashboard.processing && dashboard.isCoreRunning && ( </s> remove check.staticIP.static === DHCP_STATUS_RESPONSE.NO
&& check.staticIP.ip
&& interfaceName
</s> add check.staticIP.static === DHCP_STATUS_RESPONSE.NO &&
check.staticIP.ip &&
interfaceName | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/App/index.js |
{updateAvailable && ( | <mask>
<mask> return (
<mask> <HashRouter hashType='noslash'>
<mask> <Fragment>
<mask> {updateAvailable &&
<mask> <Fragment>
<mask> <UpdateTopline
<mask> url={dashboard.announcementUrl}
<mask> version={dashboard.newVersion}
<mask> canAutoUpdate={dashboard.canAutoUpdate}
</s> + client: split settings page into several pages </s> remove <HashRouter hashType='noslash'>
</s> add <HashRouter hashType="noslash"> </s> remove !dashboard.processingVersions &&
dashboard.isCoreRunning &&
dashboard.isUpdateAvailable;
</s> add !dashboard.processingVersions && dashboard.isCoreRunning && dashboard.isUpdateAvailable; </s> remove check.staticIP.static === DHCP_STATUS_RESPONSE.NO
&& check.staticIP.ip
&& interfaceName
</s> add check.staticIP.static === DHCP_STATUS_RESPONSE.NO &&
check.staticIP.ip &&
interfaceName </s> remove <PageTitle title={t('settings')} />
</s> add <PageTitle title={t('general_settings')} /> </s> remove components={[
<strong key="0">example</strong>,
]}
</s> add components={[<strong key="0">example</strong>]} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/App/index.js |
)}
{!encryption.processing && ( | <mask> processingUpdate={dashboard.processingUpdate}
<mask> />
<mask> <UpdateOverlay processingUpdate={dashboard.processingUpdate} />
<mask> </Fragment>
<mask> }
<mask> {!encryption.processing &&
<mask> <EncryptionTopline notAfter={encryption.not_after} />
<mask> }
<mask> <LoadingBar className="loading-bar" updateTime={1000} />
<mask> <Route component={Header} />
<mask> <div className="container container--wrap">
</s> + client: split settings page into several pages </s> remove }
</s> add )} </s> remove {!dashboard.processing && !dashboard.isCoreRunning &&
</s> add {!dashboard.processing && !dashboard.isCoreRunning && ( </s> remove }
</s> add )} </s> remove }
{!dashboard.processing && dashboard.isCoreRunning &&
</s> add )}
{!dashboard.processing && dashboard.isCoreRunning && ( | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/App/index.js |
)} | <mask> </Fragment>
<mask> }
<mask> {!encryption.processing &&
<mask> <EncryptionTopline notAfter={encryption.not_after} />
<mask> }
<mask> <LoadingBar className="loading-bar" updateTime={1000} />
<mask> <Route component={Header} />
<mask> <div className="container container--wrap">
<mask> {!dashboard.processing && !dashboard.isCoreRunning &&
<mask> <div className="row row-cards">
</s> + client: split settings page into several pages </s> remove {!dashboard.processing && !dashboard.isCoreRunning &&
</s> add {!dashboard.processing && !dashboard.isCoreRunning && ( </s> remove }
{!encryption.processing &&
</s> add )}
{!encryption.processing && ( </s> remove }
{!dashboard.processing && dashboard.isCoreRunning &&
</s> add )}
{!dashboard.processing && dashboard.isCoreRunning && ( </s> remove }
</s> add )} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/App/index.js |
{!dashboard.processing && !dashboard.isCoreRunning && ( | <mask> }
<mask> <LoadingBar className="loading-bar" updateTime={1000} />
<mask> <Route component={Header} />
<mask> <div className="container container--wrap">
<mask> {!dashboard.processing && !dashboard.isCoreRunning &&
<mask> <div className="row row-cards">
<mask> <div className="col-lg-12">
<mask> <Status handleStatusChange={this.handleStatusChange} />
<mask> </div>
<mask> </div>
</s> + client: split settings page into several pages </s> remove }
</s> add )} </s> remove }
{!encryption.processing &&
</s> add )}
{!encryption.processing && ( </s> remove }
{!dashboard.processing && dashboard.isCoreRunning &&
</s> add )}
{!dashboard.processing && dashboard.isCoreRunning && ( </s> remove }
</s> add )} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/App/index.js |
)}
{!dashboard.processing && dashboard.isCoreRunning && ( | <mask> <div className="col-lg-12">
<mask> <Status handleStatusChange={this.handleStatusChange} />
<mask> </div>
<mask> </div>
<mask> }
<mask> {!dashboard.processing && dashboard.isCoreRunning &&
<mask> <Fragment>
<mask> <Route path="/" exact component={Dashboard} />
<mask> <Route path="/settings" component={Settings} />
<mask> <Route path="/filters" component={Filters} />
<mask> <Route path="/logs" component={Logs} />
</s> + client: split settings page into several pages </s> remove }
</s> add )} </s> remove {!dashboard.processing && !dashboard.isCoreRunning &&
</s> add {!dashboard.processing && !dashboard.isCoreRunning && ( </s> remove }
</s> add )} </s> remove }
{!encryption.processing &&
</s> add )}
{!encryption.processing && ( | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/App/index.js |
<Route path="/dns" component={Dns} />
<Route path="/encryption" component={Encryption} />
<Route path="/dhcp" component={Dhcp} />
<Route path="/clients" component={Clients} /> | <mask> {!dashboard.processing && dashboard.isCoreRunning && (
<mask> <Fragment>
<mask> <Route path="/" exact component={Dashboard} />
<mask> <Route path="/settings" component={Settings} />
<mask> <Route path="/filters" component={Filters} />
<mask> <Route path="/logs" component={Logs} />
<mask> <Route path="/guide" component={SetupGuide} />
<mask> </Fragment>
<mask> )}
<mask> </div>
</s> + client: split settings page into several pages </s> remove }
{!dashboard.processing && dashboard.isCoreRunning &&
</s> add )}
{!dashboard.processing && dashboard.isCoreRunning && ( </s> remove }
</s> add )} </s> remove }
</s> add )} </s> remove {!dashboard.processing && !dashboard.isCoreRunning &&
</s> add {!dashboard.processing && !dashboard.isCoreRunning && ( </s> remove }
{!encryption.processing &&
</s> add )}
{!encryption.processing && ( | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/App/index.js |
)} | <mask> <Route path="/filters" component={Filters} />
<mask> <Route path="/logs" component={Logs} />
<mask> <Route path="/guide" component={SetupGuide} />
<mask> </Fragment>
<mask> }
<mask> </div>
<mask> <Footer />
<mask> <Toasts />
<mask> <Icons />
<mask> </Fragment>
</s> + client: split settings page into several pages </s> remove }
{!dashboard.processing && dashboard.isCoreRunning &&
</s> add )}
{!dashboard.processing && dashboard.isCoreRunning && ( </s> remove }
{!encryption.processing &&
</s> add )}
{!encryption.processing && ( </s> remove }
</s> add )} </s> remove {!dashboard.processing && !dashboard.isCoreRunning &&
</s> add {!dashboard.processing && !dashboard.isCoreRunning && ( | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/App/index.js |
.nav-tabs .nav-link.active .nav-icon,
.nav-tabs .nav-item.show .nav-icon { | <mask> margin-right: 6px;
<mask> stroke: #9aa0ac;
<mask> }
<mask>
<mask> .nav-tabs .nav-link.active .nav-icon {
<mask> stroke: #66b574;
<mask> }
<mask>
<mask> .nav-tabs .nav-link.active:hover .nav-icon {
<mask> stroke: #58a273;
</s> + client: split settings page into several pages </s> remove .nav-tabs .nav-link.active:hover .nav-icon {
</s> add .nav-tabs .nav-link.active:hover .nav-icon,
.nav-tabs .nav-item.show:hover .nav-icon { </s> remove if (this.props.encryption.enabled) {
this.props.validateTlsConfig(this.props.encryption);
</s> add const { getTlsStatus, validateTlsConfig, encryption } = this.props;
getTlsStatus();
if (encryption.enabled) {
validateTlsConfig(encryption); </s> remove }
</s> add }; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Header/Header.css |
.nav-tabs .nav-link.active:hover .nav-icon,
.nav-tabs .nav-item.show:hover .nav-icon { | <mask> .nav-tabs .nav-link.active .nav-icon {
<mask> stroke: #66b574;
<mask> }
<mask>
<mask> .nav-tabs .nav-link.active:hover .nav-icon {
<mask> stroke: #58a273;
<mask> }
<mask>
<mask> .nav-tabs .nav-link {
<mask> width: 100%;
</s> + client: split settings page into several pages </s> remove .nav-tabs .nav-link.active .nav-icon {
</s> add .nav-tabs .nav-link.active .nav-icon,
.nav-tabs .nav-item.show .nav-icon { </s> remove if (this.props.encryption.enabled) {
this.props.validateTlsConfig(this.props.encryption);
</s> add const { getTlsStatus, validateTlsConfig, encryption } = this.props;
getTlsStatus();
if (encryption.enabled) {
validateTlsConfig(encryption); </s> remove }
</s> add }; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Header/Header.css |
.nav-tabs .nav-item.show .nav-link {
color: #66b574;
background-color: #fff;
border-bottom-color: #66b574;
}
| <mask> }
<mask>
<mask> @media screen and (min-width: 992px) {
<mask> .header {
<mask> padding: 0;
<mask> }
<mask>
<mask> .nav-tabs .nav-link {
</s> + client: split settings page into several pages </s> remove .nav-tabs .nav-link.active:hover .nav-icon {
</s> add .nav-tabs .nav-link.active:hover .nav-icon,
.nav-tabs .nav-item.show:hover .nav-icon { </s> remove .nav-tabs .nav-link.active .nav-icon {
</s> add .nav-tabs .nav-link.active .nav-icon,
.nav-tabs .nav-item.show .nav-icon { </s> remove if (this.props.encryption.enabled) {
this.props.validateTlsConfig(this.props.encryption);
</s> add const { getTlsStatus, validateTlsConfig, encryption } = this.props;
getTlsStatus();
if (encryption.enabled) {
validateTlsConfig(encryption); </s> remove }
</s> add }; | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Header/Header.css |
import { SETTINGS_URLS } from '../../helpers/constants';
import Dropdown from '../ui/Dropdown';
| <mask> import classnames from 'classnames';
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask>
<mask> class Menu extends Component {
<mask> handleClickOutside = () => {
<mask> this.props.closeMenu();
<mask> };
<mask>
<mask> toggleMenu = () => {
</s> + client: split settings page into several pages </s> remove import { MODAL_TYPE, CLIENT_ID } from '../../../helpers/constants';
import Card from '../../ui/Card';
import Modal from './Modal';
</s> add import ClientsTable from './ClientsTable';
import AutoClients from './AutoClients';
import PageTitle from '../../ui/PageTitle';
import Loading from '../../ui/Loading'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
import ReactTable from 'react-table';
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Header/Menu.js |
getActiveClassForSettings = () => {
const { pathname } = this.props.location;
const isSettingsPage = SETTINGS_URLS.some(item => item === pathname);
return isSettingsPage ? 'active' : '';
};
| <mask> toggleMenu = () => {
<mask> this.props.toggleMenuOpen();
<mask> };
<mask>
<mask> render() {
<mask> const menuClass = classnames({
<mask> 'col-lg-6 mobile-menu': true,
<mask> 'mobile-menu--active': this.props.isMenuOpen,
</s> + client: split settings page into several pages </s> remove }
</s> add }; </s> remove }
</s> add }; </s> remove }
</s> add }; | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Header/Menu.js |
const dropdownControlClass = `nav-link ${this.getActiveClassForSettings()}`;
| <mask> 'col-lg-6 mobile-menu': true,
<mask> 'mobile-menu--active': this.props.isMenuOpen,
<mask> });
<mask>
<mask> return (
<mask> <Fragment>
<mask> <div className={menuClass}>
<mask> <ul className="nav nav-tabs border-0 flex-column flex-lg-row flex-nowrap">
<mask> <li className="nav-item border-bottom d-lg-none" onClick={this.toggleMenu}>
</s> + client: split settings page into several pages </s> remove <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m19 12h-14"/><path d="m12 19-7-7 7-7"/></svg>
</s> add <svg className="nav-icon">
<use xlinkHref="#back" />
</svg> </s> remove const {
enabled,
interface_name,
...values
} = dhcp.config;
</s> add const { enabled, interface_name, ...values } = dhcp.config; </s> remove : <Trans>encryption_chain_invalid</Trans>
}
</s> add ) : (
<Trans>encryption_chain_invalid</Trans>
)} </s> remove <li className={valid_chain ? 'text-success' : 'text-danger'}>
{valid_chain ?
</s> add <li
className={valid_chain ? 'text-success' : 'text-danger'}
>
{valid_chain ? ( | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Header/Menu.js |
<svg className="nav-icon">
<use xlinkHref="#back" />
</svg> | <mask> <div className={menuClass}>
<mask> <ul className="nav nav-tabs border-0 flex-column flex-lg-row flex-nowrap">
<mask> <li className="nav-item border-bottom d-lg-none" onClick={this.toggleMenu}>
<mask> <div className="nav-link nav-link--back">
<mask> <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m19 12h-14"/><path d="m12 19-7-7 7-7"/></svg>
<mask> <Trans>back</Trans>
<mask> </div>
<mask> </li>
<mask> <li className="nav-item">
<mask> <NavLink to="/" exact={true} className="nav-link">
</s> + client: split settings page into several pages </s> remove <svg className="nav-icon" fill="none" height="24" stroke="#9aa0ac" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m3 9 9-7 9 7v11a2 2 0 0 1 -2 2h-14a2 2 0 0 1 -2-2z"/><path d="m9 22v-10h6v10"/></svg>
</s> add <svg className="nav-icon">
<use xlinkHref="#dashboard" />
</svg> </s> remove <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m22 3h-20l8 9.46v6.54l4 2v-8.54z"/></svg>
</s> add <svg className="nav-icon">
<use xlinkHref="#filters" />
</svg> </s> remove <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m14 2h-8a2 2 0 0 0 -2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2v-12z"/><path d="m14 2v6h6"/><path d="m16 13h-8"/><path d="m16 17h-8"/><path d="m10 9h-1-1"/></svg>
</s> add <svg className="nav-icon">
<use xlinkHref="#log" />
</svg> </s> remove <NavLink to="/guide" href="/guide" className="nav-link">
<svg className="nav-icon" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#66b574" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"><circle cx="12" cy="12" r="10"></circle><path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3"></path><line x1="12" y1="17" x2="12" y2="17"></line></svg>
</s> add <NavLink to="/guide" className="nav-link">
<svg className="nav-icon">
<use xlinkHref="#setup" />
</svg> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Header/Menu.js |
<svg className="nav-icon">
<use xlinkHref="#dashboard" />
</svg> | <mask> </div>
<mask> </li>
<mask> <li className="nav-item">
<mask> <NavLink to="/" exact={true} className="nav-link">
<mask> <svg className="nav-icon" fill="none" height="24" stroke="#9aa0ac" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m3 9 9-7 9 7v11a2 2 0 0 1 -2 2h-14a2 2 0 0 1 -2-2z"/><path d="m9 22v-10h6v10"/></svg>
<mask> <Trans>dashboard</Trans>
<mask> </NavLink>
<mask> </li>
<mask> <li className="nav-item">
<mask> <NavLink to="/settings" className="nav-link">
</s> + client: split settings page into several pages </s> remove <li className="nav-item">
<NavLink to="/settings" className="nav-link">
<svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" r="3"/><path d="m19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1 -2.83 0l-.06-.06a1.65 1.65 0 0 0 -1.82-.33 1.65 1.65 0 0 0 -1 1.51v.17a2 2 0 0 1 -2 2 2 2 0 0 1 -2-2v-.09a1.65 1.65 0 0 0 -1.08-1.51 1.65 1.65 0 0 0 -1.82.33l-.06.06a2 2 0 0 1 -2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0 -1.51-1h-.17a2 2 0 0 1 -2-2 2 2 0 0 1 2-2h.09a1.65 1.65 0 0 0 1.51-1.08 1.65 1.65 0 0 0 -.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33h.08a1.65 1.65 0 0 0 1-1.51v-.17a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0 -.33 1.82v.08a1.65 1.65 0 0 0 1.51 1h.17a2 2 0 0 1 2 2 2 2 0 0 1 -2 2h-.09a1.65 1.65 0 0 0 -1.51 1z"/></svg>
<Trans>settings</Trans>
</NavLink>
</li>
</s> add <Dropdown
label={this.props.t('settings')}
baseClassName="dropdown nav-item"
controlClassName={dropdownControlClass}
icon="settings"
>
<Fragment>
<NavLink to="/settings" className="dropdown-item">
<Trans>general_settings</Trans>
</NavLink>
<NavLink to="/dns" className="dropdown-item">
<Trans>dns_settings</Trans>
</NavLink>
<NavLink to="/encryption" className="dropdown-item">
<Trans>encryption_settings</Trans>
</NavLink>
<NavLink to="/clients" className="dropdown-item">
<Trans>clients_settings</Trans>
</NavLink>
<NavLink to="/dhcp" className="dropdown-item">
<Trans>dhcp_settings</Trans>
</NavLink>
</Fragment>
</Dropdown> </s> remove <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m14 2h-8a2 2 0 0 0 -2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2v-12z"/><path d="m14 2v6h6"/><path d="m16 13h-8"/><path d="m16 17h-8"/><path d="m10 9h-1-1"/></svg>
</s> add <svg className="nav-icon">
<use xlinkHref="#log" />
</svg> </s> remove <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m22 3h-20l8 9.46v6.54l4 2v-8.54z"/></svg>
</s> add <svg className="nav-icon">
<use xlinkHref="#filters" />
</svg> </s> remove <NavLink to="/guide" href="/guide" className="nav-link">
<svg className="nav-icon" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#66b574" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"><circle cx="12" cy="12" r="10"></circle><path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3"></path><line x1="12" y1="17" x2="12" y2="17"></line></svg>
</s> add <NavLink to="/guide" className="nav-link">
<svg className="nav-icon">
<use xlinkHref="#setup" />
</svg> </s> remove <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m19 12h-14"/><path d="m12 19-7-7 7-7"/></svg>
</s> add <svg className="nav-icon">
<use xlinkHref="#back" />
</svg> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Header/Menu.js |
<Dropdown
label={this.props.t('settings')}
baseClassName="dropdown nav-item"
controlClassName={dropdownControlClass}
icon="settings"
>
<Fragment>
<NavLink to="/settings" className="dropdown-item">
<Trans>general_settings</Trans>
</NavLink>
<NavLink to="/dns" className="dropdown-item">
<Trans>dns_settings</Trans>
</NavLink>
<NavLink to="/encryption" className="dropdown-item">
<Trans>encryption_settings</Trans>
</NavLink>
<NavLink to="/clients" className="dropdown-item">
<Trans>clients_settings</Trans>
</NavLink>
<NavLink to="/dhcp" className="dropdown-item">
<Trans>dhcp_settings</Trans>
</NavLink>
</Fragment>
</Dropdown> | <mask> <svg className="nav-icon" fill="none" height="24" stroke="#9aa0ac" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m3 9 9-7 9 7v11a2 2 0 0 1 -2 2h-14a2 2 0 0 1 -2-2z"/><path d="m9 22v-10h6v10"/></svg>
<mask> <Trans>dashboard</Trans>
<mask> </NavLink>
<mask> </li>
<mask> <li className="nav-item">
<mask> <NavLink to="/settings" className="nav-link">
<mask> <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" r="3"/><path d="m19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1 -2.83 0l-.06-.06a1.65 1.65 0 0 0 -1.82-.33 1.65 1.65 0 0 0 -1 1.51v.17a2 2 0 0 1 -2 2 2 2 0 0 1 -2-2v-.09a1.65 1.65 0 0 0 -1.08-1.51 1.65 1.65 0 0 0 -1.82.33l-.06.06a2 2 0 0 1 -2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0 -1.51-1h-.17a2 2 0 0 1 -2-2 2 2 0 0 1 2-2h.09a1.65 1.65 0 0 0 1.51-1.08 1.65 1.65 0 0 0 -.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33h.08a1.65 1.65 0 0 0 1-1.51v-.17a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0 -.33 1.82v.08a1.65 1.65 0 0 0 1.51 1h.17a2 2 0 0 1 2 2 2 2 0 0 1 -2 2h-.09a1.65 1.65 0 0 0 -1.51 1z"/></svg>
<mask> <Trans>settings</Trans>
<mask> </NavLink>
<mask> </li>
<mask> <li className="nav-item">
<mask> <NavLink to="/filters" className="nav-link">
<mask> <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m22 3h-20l8 9.46v6.54l4 2v-8.54z"/></svg>
<mask> <Trans>filters</Trans>
<mask> </NavLink>
</s> + client: split settings page into several pages </s> remove <svg className="nav-icon" fill="none" height="24" stroke="#9aa0ac" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m3 9 9-7 9 7v11a2 2 0 0 1 -2 2h-14a2 2 0 0 1 -2-2z"/><path d="m9 22v-10h6v10"/></svg>
</s> add <svg className="nav-icon">
<use xlinkHref="#dashboard" />
</svg> </s> remove <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m14 2h-8a2 2 0 0 0 -2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2v-12z"/><path d="m14 2v6h6"/><path d="m16 13h-8"/><path d="m16 17h-8"/><path d="m10 9h-1-1"/></svg>
</s> add <svg className="nav-icon">
<use xlinkHref="#log" />
</svg> </s> remove <NavLink to="/guide" href="/guide" className="nav-link">
<svg className="nav-icon" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#66b574" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"><circle cx="12" cy="12" r="10"></circle><path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3"></path><line x1="12" y1="17" x2="12" y2="17"></line></svg>
</s> add <NavLink to="/guide" className="nav-link">
<svg className="nav-icon">
<use xlinkHref="#setup" />
</svg> </s> remove <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m22 3h-20l8 9.46v6.54l4 2v-8.54z"/></svg>
</s> add <svg className="nav-icon">
<use xlinkHref="#filters" />
</svg> </s> remove <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m19 12h-14"/><path d="m12 19-7-7 7-7"/></svg>
</s> add <svg className="nav-icon">
<use xlinkHref="#back" />
</svg> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Header/Menu.js |
<svg className="nav-icon">
<use xlinkHref="#filters" />
</svg> | <mask> </NavLink>
<mask> </li>
<mask> <li className="nav-item">
<mask> <NavLink to="/filters" className="nav-link">
<mask> <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m22 3h-20l8 9.46v6.54l4 2v-8.54z"/></svg>
<mask> <Trans>filters</Trans>
<mask> </NavLink>
<mask> </li>
<mask> <li className="nav-item">
<mask> <NavLink to="/logs" className="nav-link">
</s> + client: split settings page into several pages </s> remove <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m14 2h-8a2 2 0 0 0 -2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2v-12z"/><path d="m14 2v6h6"/><path d="m16 13h-8"/><path d="m16 17h-8"/><path d="m10 9h-1-1"/></svg>
</s> add <svg className="nav-icon">
<use xlinkHref="#log" />
</svg> </s> remove <svg className="nav-icon" fill="none" height="24" stroke="#9aa0ac" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m3 9 9-7 9 7v11a2 2 0 0 1 -2 2h-14a2 2 0 0 1 -2-2z"/><path d="m9 22v-10h6v10"/></svg>
</s> add <svg className="nav-icon">
<use xlinkHref="#dashboard" />
</svg> </s> remove <NavLink to="/guide" href="/guide" className="nav-link">
<svg className="nav-icon" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#66b574" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"><circle cx="12" cy="12" r="10"></circle><path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3"></path><line x1="12" y1="17" x2="12" y2="17"></line></svg>
</s> add <NavLink to="/guide" className="nav-link">
<svg className="nav-icon">
<use xlinkHref="#setup" />
</svg> </s> remove <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m19 12h-14"/><path d="m12 19-7-7 7-7"/></svg>
</s> add <svg className="nav-icon">
<use xlinkHref="#back" />
</svg> </s> remove <li className="nav-item">
<NavLink to="/settings" className="nav-link">
<svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" r="3"/><path d="m19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1 -2.83 0l-.06-.06a1.65 1.65 0 0 0 -1.82-.33 1.65 1.65 0 0 0 -1 1.51v.17a2 2 0 0 1 -2 2 2 2 0 0 1 -2-2v-.09a1.65 1.65 0 0 0 -1.08-1.51 1.65 1.65 0 0 0 -1.82.33l-.06.06a2 2 0 0 1 -2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0 -1.51-1h-.17a2 2 0 0 1 -2-2 2 2 0 0 1 2-2h.09a1.65 1.65 0 0 0 1.51-1.08 1.65 1.65 0 0 0 -.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33h.08a1.65 1.65 0 0 0 1-1.51v-.17a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0 -.33 1.82v.08a1.65 1.65 0 0 0 1.51 1h.17a2 2 0 0 1 2 2 2 2 0 0 1 -2 2h-.09a1.65 1.65 0 0 0 -1.51 1z"/></svg>
<Trans>settings</Trans>
</NavLink>
</li>
</s> add <Dropdown
label={this.props.t('settings')}
baseClassName="dropdown nav-item"
controlClassName={dropdownControlClass}
icon="settings"
>
<Fragment>
<NavLink to="/settings" className="dropdown-item">
<Trans>general_settings</Trans>
</NavLink>
<NavLink to="/dns" className="dropdown-item">
<Trans>dns_settings</Trans>
</NavLink>
<NavLink to="/encryption" className="dropdown-item">
<Trans>encryption_settings</Trans>
</NavLink>
<NavLink to="/clients" className="dropdown-item">
<Trans>clients_settings</Trans>
</NavLink>
<NavLink to="/dhcp" className="dropdown-item">
<Trans>dhcp_settings</Trans>
</NavLink>
</Fragment>
</Dropdown> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Header/Menu.js |
<svg className="nav-icon">
<use xlinkHref="#log" />
</svg> | <mask> </NavLink>
<mask> </li>
<mask> <li className="nav-item">
<mask> <NavLink to="/logs" className="nav-link">
<mask> <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m14 2h-8a2 2 0 0 0 -2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2v-12z"/><path d="m14 2v6h6"/><path d="m16 13h-8"/><path d="m16 17h-8"/><path d="m10 9h-1-1"/></svg>
<mask> <Trans>query_log</Trans>
<mask> </NavLink>
<mask> </li>
<mask> <li className="nav-item">
<mask> <NavLink to="/guide" href="/guide" className="nav-link">
</s> + client: split settings page into several pages </s> remove <svg className="nav-icon" fill="none" height="24" stroke="#9aa0ac" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m3 9 9-7 9 7v11a2 2 0 0 1 -2 2h-14a2 2 0 0 1 -2-2z"/><path d="m9 22v-10h6v10"/></svg>
</s> add <svg className="nav-icon">
<use xlinkHref="#dashboard" />
</svg> </s> remove <li className="nav-item">
<NavLink to="/settings" className="nav-link">
<svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" r="3"/><path d="m19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1 -2.83 0l-.06-.06a1.65 1.65 0 0 0 -1.82-.33 1.65 1.65 0 0 0 -1 1.51v.17a2 2 0 0 1 -2 2 2 2 0 0 1 -2-2v-.09a1.65 1.65 0 0 0 -1.08-1.51 1.65 1.65 0 0 0 -1.82.33l-.06.06a2 2 0 0 1 -2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0 -1.51-1h-.17a2 2 0 0 1 -2-2 2 2 0 0 1 2-2h.09a1.65 1.65 0 0 0 1.51-1.08 1.65 1.65 0 0 0 -.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33h.08a1.65 1.65 0 0 0 1-1.51v-.17a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0 -.33 1.82v.08a1.65 1.65 0 0 0 1.51 1h.17a2 2 0 0 1 2 2 2 2 0 0 1 -2 2h-.09a1.65 1.65 0 0 0 -1.51 1z"/></svg>
<Trans>settings</Trans>
</NavLink>
</li>
</s> add <Dropdown
label={this.props.t('settings')}
baseClassName="dropdown nav-item"
controlClassName={dropdownControlClass}
icon="settings"
>
<Fragment>
<NavLink to="/settings" className="dropdown-item">
<Trans>general_settings</Trans>
</NavLink>
<NavLink to="/dns" className="dropdown-item">
<Trans>dns_settings</Trans>
</NavLink>
<NavLink to="/encryption" className="dropdown-item">
<Trans>encryption_settings</Trans>
</NavLink>
<NavLink to="/clients" className="dropdown-item">
<Trans>clients_settings</Trans>
</NavLink>
<NavLink to="/dhcp" className="dropdown-item">
<Trans>dhcp_settings</Trans>
</NavLink>
</Fragment>
</Dropdown> </s> remove <NavLink to="/guide" href="/guide" className="nav-link">
<svg className="nav-icon" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#66b574" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"><circle cx="12" cy="12" r="10"></circle><path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3"></path><line x1="12" y1="17" x2="12" y2="17"></line></svg>
</s> add <NavLink to="/guide" className="nav-link">
<svg className="nav-icon">
<use xlinkHref="#setup" />
</svg> </s> remove <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m22 3h-20l8 9.46v6.54l4 2v-8.54z"/></svg>
</s> add <svg className="nav-icon">
<use xlinkHref="#filters" />
</svg> </s> remove <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m19 12h-14"/><path d="m12 19-7-7 7-7"/></svg>
</s> add <svg className="nav-icon">
<use xlinkHref="#back" />
</svg> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Header/Menu.js |
<NavLink to="/guide" className="nav-link">
<svg className="nav-icon">
<use xlinkHref="#setup" />
</svg> | <mask> <Trans>query_log</Trans>
<mask> </NavLink>
<mask> </li>
<mask> <li className="nav-item">
<mask> <NavLink to="/guide" href="/guide" className="nav-link">
<mask> <svg className="nav-icon" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#66b574" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"><circle cx="12" cy="12" r="10"></circle><path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3"></path><line x1="12" y1="17" x2="12" y2="17"></line></svg>
<mask> <Trans>setup_guide</Trans>
<mask> </NavLink>
<mask> </li>
<mask> </ul>
<mask> </div>
</s> + client: split settings page into several pages </s> remove <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m14 2h-8a2 2 0 0 0 -2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2v-12z"/><path d="m14 2v6h6"/><path d="m16 13h-8"/><path d="m16 17h-8"/><path d="m10 9h-1-1"/></svg>
</s> add <svg className="nav-icon">
<use xlinkHref="#log" />
</svg> </s> remove <svg className="nav-icon" fill="none" height="24" stroke="#9aa0ac" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m3 9 9-7 9 7v11a2 2 0 0 1 -2 2h-14a2 2 0 0 1 -2-2z"/><path d="m9 22v-10h6v10"/></svg>
</s> add <svg className="nav-icon">
<use xlinkHref="#dashboard" />
</svg> </s> remove <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m22 3h-20l8 9.46v6.54l4 2v-8.54z"/></svg>
</s> add <svg className="nav-icon">
<use xlinkHref="#filters" />
</svg> </s> remove <li className="nav-item">
<NavLink to="/settings" className="nav-link">
<svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" r="3"/><path d="m19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1 -2.83 0l-.06-.06a1.65 1.65 0 0 0 -1.82-.33 1.65 1.65 0 0 0 -1 1.51v.17a2 2 0 0 1 -2 2 2 2 0 0 1 -2-2v-.09a1.65 1.65 0 0 0 -1.08-1.51 1.65 1.65 0 0 0 -1.82.33l-.06.06a2 2 0 0 1 -2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0 -1.51-1h-.17a2 2 0 0 1 -2-2 2 2 0 0 1 2-2h.09a1.65 1.65 0 0 0 1.51-1.08 1.65 1.65 0 0 0 -.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33h.08a1.65 1.65 0 0 0 1-1.51v-.17a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0 -.33 1.82v.08a1.65 1.65 0 0 0 1.51 1h.17a2 2 0 0 1 2 2 2 2 0 0 1 -2 2h-.09a1.65 1.65 0 0 0 -1.51 1z"/></svg>
<Trans>settings</Trans>
</NavLink>
</li>
</s> add <Dropdown
label={this.props.t('settings')}
baseClassName="dropdown nav-item"
controlClassName={dropdownControlClass}
icon="settings"
>
<Fragment>
<NavLink to="/settings" className="dropdown-item">
<Trans>general_settings</Trans>
</NavLink>
<NavLink to="/dns" className="dropdown-item">
<Trans>dns_settings</Trans>
</NavLink>
<NavLink to="/encryption" className="dropdown-item">
<Trans>encryption_settings</Trans>
</NavLink>
<NavLink to="/clients" className="dropdown-item">
<Trans>clients_settings</Trans>
</NavLink>
<NavLink to="/dhcp" className="dropdown-item">
<Trans>dhcp_settings</Trans>
</NavLink>
</Fragment>
</Dropdown> </s> remove <svg className="nav-icon" fill="none" height="24" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m19 12h-14"/><path d="m12 19-7-7 7-7"/></svg>
</s> add <svg className="nav-icon">
<use xlinkHref="#back" />
</svg> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Header/Menu.js |
location: PropTypes.object,
t: PropTypes.func, | <mask> isMenuOpen: PropTypes.bool,
<mask> closeMenu: PropTypes.func,
<mask> toggleMenuOpen: PropTypes.func,
<mask> };
<mask>
<mask> export default withNamespaces()(enhanceWithClickOutside(Menu));
</s> + client: split settings page into several pages </s> remove handleUpstreamChange: PropTypes.func,
setUpstream: PropTypes.func,
</s> add </s> remove handleSubmit: PropTypes.func,
</s> add </s> remove }
</s> add }; </s> remove }
</s> add }; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Header/Menu.js |
import { withNamespaces } from 'react-i18next'; | <mask> import React, { Component, Fragment } from 'react';
<mask> import PropTypes from 'prop-types';
<mask>
<mask> import ClientsTable from './ClientsTable';
<mask> import AutoClients from './AutoClients';
</s> + client: split settings page into several pages </s> remove import { Trans, withNamespaces } from 'react-i18next';
import ReactTable from 'react-table';
</s> add </s> remove import Upstream from './Upstream';
import Dhcp from './Dhcp';
import Encryption from './Encryption';
import Clients from './Clients';
import AutoClients from './Clients/AutoClients';
import Access from './Access';
</s> add </s> remove import { MODAL_TYPE, CLIENT_ID } from '../../../helpers/constants';
import Card from '../../ui/Card';
import Modal from './Modal';
</s> add import ClientsTable from './ClientsTable';
import AutoClients from './AutoClients';
import PageTitle from '../../ui/PageTitle';
import Loading from '../../ui/Loading'; | [
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Clients/index.js |
<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, CLIENT_ID } from '../../../helpers/constants';
<mask> import Card from '../../ui/Card';
<mask> import Modal from './Modal';
<mask>
</s> + client: split settings page into several pages </s> remove import { MODAL_TYPE, CLIENT_ID } from '../../../helpers/constants';
import Card from '../../ui/Card';
import Modal from './Modal';
</s> add import ClientsTable from './ClientsTable';
import AutoClients from './AutoClients';
import PageTitle from '../../ui/PageTitle';
import Loading from '../../ui/Loading'; </s> remove import Upstream from './Upstream';
import Dhcp from './Dhcp';
import Encryption from './Encryption';
import Clients from './Clients';
import AutoClients from './Clients/AutoClients';
import Access from './Access';
</s> add | [
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Clients/index.js | |
import ClientsTable from './ClientsTable';
import AutoClients from './AutoClients';
import PageTitle from '../../ui/PageTitle';
import Loading from '../../ui/Loading'; | <mask> import PropTypes from 'prop-types';
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask> import ReactTable from 'react-table';
<mask>
<mask> import { MODAL_TYPE, CLIENT_ID } from '../../../helpers/constants';
<mask> import Card from '../../ui/Card';
<mask> import Modal from './Modal';
<mask>
<mask> class Clients extends Component {
<mask> handleFormAdd = (values) => {
<mask> this.props.addClient(values);
<mask> };
</s> + client: split settings page into several pages </s> remove import { Trans, withNamespaces } from 'react-i18next';
import ReactTable from 'react-table';
</s> add </s> remove import Upstream from './Upstream';
import Dhcp from './Dhcp';
import Encryption from './Encryption';
import Clients from './Clients';
import AutoClients from './Clients/AutoClients';
import Access from './Access';
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Clients/index.js |
const { dashboard, clients, t } = this.props; | <mask> },
<mask> ];
<mask>
<mask> render() {
<mask> const {
<mask> t,
<mask> clients,
<mask> isModalOpen,
<mask> modalType,
<mask> modalClientName,
<mask> toggleClientModal,
<mask> processingAdding,
<mask> processingUpdating,
<mask> } = this.props;
<mask>
<mask> const currentClientData = this.getClient(modalClientName, clients);
<mask>
<mask> return (
<mask> <Card
<mask> title={t('clients_title')}
<mask> subtitle={t('clients_desc')}
</s> + client: split settings page into several pages </s> remove const {
settings, dashboard, clients, access, t,
} = this.props;
</s> add const { settings, t } = this.props; </s> remove }
</s> add }; </s> remove }
</s> add }; </s> remove !dashboard.processingVersions &&
dashboard.isCoreRunning &&
dashboard.isUpdateAvailable;
</s> add !dashboard.processingVersions && dashboard.isCoreRunning && dashboard.isUpdateAvailable; </s> remove <Card
title={t('clients_title')}
subtitle={t('clients_desc')}
bodyType="card-body box-body--settings"
>
<Fragment>
<ReactTable
data={clients || []}
columns={this.columns}
className="-striped -highlight card-table-overflow"
showPagination={true}
defaultPageSize={10}
minRows={5}
previousText={t('previous_btn')}
nextText={t('next_btn')}
loadingText={t('loading_table_status')}
pageText={t('page_table_footer_text')}
ofText={t('of_table_footer_text')}
rowsText={t('rows_table_footer_text')}
noDataText={t('clients_not_found')}
/>
<button
type="button"
className="btn btn-success btn-standard mt-3"
onClick={() => toggleClientModal(MODAL_TYPE.ADD)}
disabled={processingAdding}
>
<Trans>client_add</Trans>
</button>
<Modal
isModalOpen={isModalOpen}
modalType={modalType}
toggleClientModal={toggleClientModal}
currentClientData={currentClientData}
handleSubmit={this.handleSubmit}
processingAdding={processingAdding}
processingUpdating={processingUpdating}
/>
</Fragment>
</Card>
</s> add <Fragment>
<PageTitle title={t('clients_settings')} />
{!dashboard.processingTopStats || (!dashboard.processingClients && <Loading />)}
{!dashboard.processingTopStats && !dashboard.processingClients && (
<Fragment>
<ClientsTable
clients={dashboard.clients}
topStats={dashboard.topStats}
isModalOpen={clients.isModalOpen}
modalClientName={clients.modalClientName}
modalType={clients.modalType}
addClient={this.props.addClient}
updateClient={this.props.updateClient}
deleteClient={this.props.deleteClient}
toggleClientModal={this.props.toggleClientModal}
processingAdding={clients.processingAdding}
processingDeleting={clients.processingDeleting}
processingUpdating={clients.processingUpdating}
/>
<AutoClients
autoClients={dashboard.autoClients}
topStats={dashboard.topStats}
/>
</Fragment>
)}
</Fragment> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Clients/index.js |
<Fragment>
<PageTitle title={t('clients_settings')} />
{!dashboard.processingTopStats || (!dashboard.processingClients && <Loading />)}
{!dashboard.processingTopStats && !dashboard.processingClients && (
<Fragment>
<ClientsTable
clients={dashboard.clients}
topStats={dashboard.topStats}
isModalOpen={clients.isModalOpen}
modalClientName={clients.modalClientName}
modalType={clients.modalType}
addClient={this.props.addClient}
updateClient={this.props.updateClient}
deleteClient={this.props.deleteClient}
toggleClientModal={this.props.toggleClientModal}
processingAdding={clients.processingAdding}
processingDeleting={clients.processingDeleting}
processingUpdating={clients.processingUpdating}
/>
<AutoClients
autoClients={dashboard.autoClients}
topStats={dashboard.topStats}
/>
</Fragment>
)}
</Fragment> | <mask>
<mask> const currentClientData = this.getClient(modalClientName, clients);
<mask>
<mask> return (
<mask> <Card
<mask> title={t('clients_title')}
<mask> subtitle={t('clients_desc')}
<mask> bodyType="card-body box-body--settings"
<mask> >
<mask> <Fragment>
<mask> <ReactTable
<mask> data={clients || []}
<mask> columns={this.columns}
<mask> className="-striped -highlight card-table-overflow"
<mask> showPagination={true}
<mask> defaultPageSize={10}
<mask> minRows={5}
<mask> previousText={t('previous_btn')}
<mask> nextText={t('next_btn')}
<mask> loadingText={t('loading_table_status')}
<mask> pageText={t('page_table_footer_text')}
<mask> ofText={t('of_table_footer_text')}
<mask> rowsText={t('rows_table_footer_text')}
<mask> noDataText={t('clients_not_found')}
<mask> />
<mask> <button
<mask> type="button"
<mask> className="btn btn-success btn-standard mt-3"
<mask> onClick={() => toggleClientModal(MODAL_TYPE.ADD)}
<mask> disabled={processingAdding}
<mask> >
<mask> <Trans>client_add</Trans>
<mask> </button>
<mask>
<mask> <Modal
<mask> isModalOpen={isModalOpen}
<mask> modalType={modalType}
<mask> toggleClientModal={toggleClientModal}
<mask> currentClientData={currentClientData}
<mask> handleSubmit={this.handleSubmit}
<mask> processingAdding={processingAdding}
<mask> processingUpdating={processingUpdating}
<mask> />
<mask> </Fragment>
<mask> </Card>
<mask> );
<mask> }
<mask> }
<mask>
<mask> Clients.propTypes = {
</s> + client: split settings page into several pages </s> remove </div>
<div className="col-12">
<button
type="button"
className="btn btn-success btn-standard mt-3"
onClick={() => this.props.toggleLeaseModal()}
>
<Trans>dhcp_add_static_lease</Trans>
</button>
</div>
</s> add <hr />
<div className="card-actions mb-3">
{this.getToggleDhcpButton()}
<button
type="button"
className={statusButtonClass}
onClick={() =>
this.props.findActiveDhcp(interface_name)
}
disabled={
enabled || !interface_name || dhcp.processingConfig
}
>
<Trans>check_dhcp_servers</Trans>
</button>
</div>
{!enabled && dhcp.check && (
<Fragment>
{this.getStaticIpWarning(t, dhcp.check, interface_name)}
{this.getActiveDhcpMessage(t, dhcp.check)}
{this.getDhcpWarning(dhcp.check)}
</Fragment>
)}
</Fragment> </s> remove const {
t,
clients,
isModalOpen,
modalType,
modalClientName,
toggleClientModal,
processingAdding,
processingUpdating,
} = this.props;
const currentClientData = this.getClient(modalClientName, clients);
</s> add const { dashboard, clients, t } = this.props; </s> remove !filledConfig
|| !check
|| otherDhcpFound
|| processingDhcp
|| processingConfig
</s> add !filledConfig || !check || otherDhcpFound || processingDhcp || processingConfig </s> remove <Card title={ t('dhcp_title') } subtitle={ t('dhcp_description') } bodyType="card-body box-body--settings">
<div className="dhcp">
{!dhcp.processing &&
<Fragment>
<Form
onSubmit={this.handleFormSubmit}
initialValues={{
interface_name,
...values,
}}
interfaces={dhcp.interfaces}
processingConfig={dhcp.processingConfig}
processingInterfaces={dhcp.processingInterfaces}
enabled={enabled}
/>
<hr/>
<div className="card-actions mb-3">
{this.getToggleDhcpButton()}
<button
type="button"
className={statusButtonClass}
onClick={() =>
this.props.findActiveDhcp(interface_name)
}
disabled={
enabled
|| !interface_name
|| dhcp.processingConfig
}
>
<Trans>check_dhcp_servers</Trans>
</button>
</div>
{!enabled && dhcp.check &&
<Fragment>
{this.getStaticIpWarning(t, dhcp.check, interface_name)}
{this.getActiveDhcpMessage(t, dhcp.check)}
{this.getDhcpWarning(dhcp.check)}
</Fragment>
}
</Fragment>
}
</div>
</Card>
{!dhcp.processing && dhcp.config.enabled &&
</s> add <PageTitle title={t('dhcp_settings')} />
{(dhcp.processing || dhcp.processingInterfaces) && <Loading />}
{!dhcp.processing && !dhcp.processingInterfaces && ( </s> remove <Card title={ t('dhcp_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<Leases leases={dhcp.leases} />
</div>
</div>
</Card>
<Card title={ t('dhcp_static_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col-12">
<StaticLeases
staticLeases={dhcp.staticLeases}
isModalOpen={dhcp.isModalOpen}
addStaticLease={this.props.addStaticLease}
removeStaticLease={this.props.removeStaticLease}
toggleLeaseModal={this.props.toggleLeaseModal}
processingAdding={dhcp.processingAdding}
processingDeleting={dhcp.processingDeleting}
</s> add <Card
title={t('dhcp_title')}
subtitle={t('dhcp_description')}
bodyType="card-body box-body--settings"
>
<div className="dhcp">
<Fragment>
<Form
onSubmit={this.handleFormSubmit}
initialValues={{
interface_name,
...values,
}}
interfaces={dhcp.interfaces}
processingConfig={dhcp.processingConfig}
processingInterfaces={dhcp.processingInterfaces}
enabled={enabled} | [
"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/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Clients/index.js |
dashboard: PropTypes.object.isRequired, | <mask> Clients.propTypes = {
<mask> t: PropTypes.func.isRequired,
<mask> clients: PropTypes.array.isRequired,
<mask> topStats: PropTypes.object.isRequired,
<mask> toggleClientModal: PropTypes.func.isRequired,
<mask> deleteClient: PropTypes.func.isRequired,
<mask> addClient: PropTypes.func.isRequired,
</s> + client: split settings page into several pages </s> remove handleUpstreamChange: PropTypes.func,
setUpstream: PropTypes.func,
</s> add </s> remove handleSubmit: PropTypes.func,
</s> add </s> remove <Card
title={t('clients_title')}
subtitle={t('clients_desc')}
bodyType="card-body box-body--settings"
>
<Fragment>
<ReactTable
data={clients || []}
columns={this.columns}
className="-striped -highlight card-table-overflow"
showPagination={true}
defaultPageSize={10}
minRows={5}
previousText={t('previous_btn')}
nextText={t('next_btn')}
loadingText={t('loading_table_status')}
pageText={t('page_table_footer_text')}
ofText={t('of_table_footer_text')}
rowsText={t('rows_table_footer_text')}
noDataText={t('clients_not_found')}
/>
<button
type="button"
className="btn btn-success btn-standard mt-3"
onClick={() => toggleClientModal(MODAL_TYPE.ADD)}
disabled={processingAdding}
>
<Trans>client_add</Trans>
</button>
<Modal
isModalOpen={isModalOpen}
modalType={modalType}
toggleClientModal={toggleClientModal}
currentClientData={currentClientData}
handleSubmit={this.handleSubmit}
processingAdding={processingAdding}
processingUpdating={processingUpdating}
/>
</Fragment>
</Card>
</s> add <Fragment>
<PageTitle title={t('clients_settings')} />
{!dashboard.processingTopStats || (!dashboard.processingClients && <Loading />)}
{!dashboard.processingTopStats && !dashboard.processingClients && (
<Fragment>
<ClientsTable
clients={dashboard.clients}
topStats={dashboard.topStats}
isModalOpen={clients.isModalOpen}
modalClientName={clients.modalClientName}
modalType={clients.modalType}
addClient={this.props.addClient}
updateClient={this.props.updateClient}
deleteClient={this.props.deleteClient}
toggleClientModal={this.props.toggleClientModal}
processingAdding={clients.processingAdding}
processingDeleting={clients.processingDeleting}
processingUpdating={clients.processingUpdating}
/>
<AutoClients
autoClients={dashboard.autoClients}
topStats={dashboard.topStats}
/>
</Fragment>
)}
</Fragment> | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Clients/index.js |
import PageTitle from '../../ui/PageTitle';
import Loading from '../../ui/Loading'; | <mask> import Leases from './Leases';
<mask> import StaticLeases from './StaticLeases/index';
<mask> import Card from '../../ui/Card';
<mask> import Accordion from '../../ui/Accordion';
<mask>
<mask> class Dhcp extends Component {
<mask> componentDidMount() {
<mask> this.props.getDhcpStatus();
</s> + client: split settings page into several pages </s> remove import { MODAL_TYPE, CLIENT_ID } from '../../../helpers/constants';
import Card from '../../ui/Card';
import Modal from './Modal';
</s> add import ClientsTable from './ClientsTable';
import AutoClients from './AutoClients';
import PageTitle from '../../ui/PageTitle';
import Loading from '../../ui/Loading'; </s> remove import Upstream from './Upstream';
import Dhcp from './Dhcp';
import Encryption from './Encryption';
import Clients from './Clients';
import AutoClients from './Clients/AutoClients';
import Access from './Access';
</s> add </s> remove import { Trans, withNamespaces } from 'react-i18next';
import ReactTable from 'react-table';
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Dhcp/index.js |
componentDidMount() {
this.props.getDhcpStatus();
this.props.getDhcpInterfaces();
}
| <mask>
<mask> class Dhcp extends Component {
<mask> handleFormSubmit = (values) => {
<mask> if (values.interface_name) {
<mask> this.props.setDhcpConfig(values);
<mask> }
</s> + client: split settings page into several pages </s> remove if (this.props.encryption.enabled) {
this.props.validateTlsConfig(this.props.encryption);
</s> add const { getTlsStatus, validateTlsConfig, encryption } = this.props;
getTlsStatus();
if (encryption.enabled) {
validateTlsConfig(encryption); </s> remove import { MODAL_TYPE, CLIENT_ID } from '../../../helpers/constants';
import Card from '../../ui/Card';
import Modal from './Modal';
</s> add import ClientsTable from './ClientsTable';
import AutoClients from './AutoClients';
import PageTitle from '../../ui/PageTitle';
import Loading from '../../ui/Loading'; | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Dhcp/index.js |
}; | <mask> };
<mask>
<mask> handleToggle = (config) => {
<mask> this.props.toggleDhcp(config);
<mask> }
<mask>
<mask> getToggleDhcpButton = () => {
<mask> const {
<mask> config, check, processingDhcp, processingConfig,
<mask> } = this.props.dhcp;
</s> + client: split settings page into several pages </s> remove }
</s> add }; </s> remove }
</s> add }; </s> remove }
</s> add }; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Dhcp/index.js |
!filledConfig || !check || otherDhcpFound || processingDhcp || processingConfig | <mask> type="button"
<mask> className="btn btn-standard mr-2 btn-success"
<mask> onClick={() => this.handleToggle(config)}
<mask> disabled={
<mask> !filledConfig
<mask> || !check
<mask> || otherDhcpFound
<mask> || processingDhcp
<mask> || processingConfig
<mask> }
<mask> >
<mask> <Trans>dhcp_enable</Trans>
<mask> </button>
<mask> );
</s> + client: split settings page into several pages </s> remove </div>
<div className="col-12">
<button
type="button"
className="btn btn-success btn-standard mt-3"
onClick={() => this.props.toggleLeaseModal()}
>
<Trans>dhcp_add_static_lease</Trans>
</button>
</div>
</s> add <hr />
<div className="card-actions mb-3">
{this.getToggleDhcpButton()}
<button
type="button"
className={statusButtonClass}
onClick={() =>
this.props.findActiveDhcp(interface_name)
}
disabled={
enabled || !interface_name || dhcp.processingConfig
}
>
<Trans>check_dhcp_servers</Trans>
</button>
</div>
{!enabled && dhcp.check && (
<Fragment>
{this.getStaticIpWarning(t, dhcp.check, interface_name)}
{this.getActiveDhcpMessage(t, dhcp.check)}
{this.getDhcpWarning(dhcp.check)}
</Fragment>
)}
</Fragment> </s> remove const isSavingDisabled = invalid
|| submitting
|| processingConfig
|| processingValidate
|| (isEnabled && (!privateKey || !certificateChain))
|| (privateKey && !valid_key)
|| (certificateChain && !valid_cert)
|| (privateKey && certificateChain && !valid_pair);
</s> add const isSavingDisabled =
invalid ||
submitting ||
processingConfig ||
processingValidate ||
(isEnabled && (!privateKey || !certificateChain)) ||
(privateKey && !valid_key) ||
(certificateChain && !valid_cert) ||
(privateKey && certificateChain && !valid_pair); </s> remove <Card
title={t('clients_title')}
subtitle={t('clients_desc')}
bodyType="card-body box-body--settings"
>
<Fragment>
<ReactTable
data={clients || []}
columns={this.columns}
className="-striped -highlight card-table-overflow"
showPagination={true}
defaultPageSize={10}
minRows={5}
previousText={t('previous_btn')}
nextText={t('next_btn')}
loadingText={t('loading_table_status')}
pageText={t('page_table_footer_text')}
ofText={t('of_table_footer_text')}
rowsText={t('rows_table_footer_text')}
noDataText={t('clients_not_found')}
/>
<button
type="button"
className="btn btn-success btn-standard mt-3"
onClick={() => toggleClientModal(MODAL_TYPE.ADD)}
disabled={processingAdding}
>
<Trans>client_add</Trans>
</button>
<Modal
isModalOpen={isModalOpen}
modalType={modalType}
toggleClientModal={toggleClientModal}
currentClientData={currentClientData}
handleSubmit={this.handleSubmit}
processingAdding={processingAdding}
processingUpdating={processingUpdating}
/>
</Fragment>
</Card>
</s> add <Fragment>
<PageTitle title={t('clients_settings')} />
{!dashboard.processingTopStats || (!dashboard.processingClients && <Loading />)}
{!dashboard.processingTopStats && !dashboard.processingClients && (
<Fragment>
<ClientsTable
clients={dashboard.clients}
topStats={dashboard.topStats}
isModalOpen={clients.isModalOpen}
modalClientName={clients.modalClientName}
modalType={clients.modalType}
addClient={this.props.addClient}
updateClient={this.props.updateClient}
deleteClient={this.props.deleteClient}
toggleClientModal={this.props.toggleClientModal}
processingAdding={clients.processingAdding}
processingDeleting={clients.processingDeleting}
processingUpdating={clients.processingUpdating}
/>
<AutoClients
autoClients={dashboard.autoClients}
topStats={dashboard.topStats}
/>
</Fragment>
)}
</Fragment> </s> remove <Card title={ t('dhcp_title') } subtitle={ t('dhcp_description') } bodyType="card-body box-body--settings">
<div className="dhcp">
{!dhcp.processing &&
<Fragment>
<Form
onSubmit={this.handleFormSubmit}
initialValues={{
interface_name,
...values,
}}
interfaces={dhcp.interfaces}
processingConfig={dhcp.processingConfig}
processingInterfaces={dhcp.processingInterfaces}
enabled={enabled}
/>
<hr/>
<div className="card-actions mb-3">
{this.getToggleDhcpButton()}
<button
type="button"
className={statusButtonClass}
onClick={() =>
this.props.findActiveDhcp(interface_name)
}
disabled={
enabled
|| !interface_name
|| dhcp.processingConfig
}
>
<Trans>check_dhcp_servers</Trans>
</button>
</div>
{!enabled && dhcp.check &&
<Fragment>
{this.getStaticIpWarning(t, dhcp.check, interface_name)}
{this.getActiveDhcpMessage(t, dhcp.check)}
{this.getDhcpWarning(dhcp.check)}
</Fragment>
}
</Fragment>
}
</div>
</Card>
{!dhcp.processing && dhcp.config.enabled &&
</s> add <PageTitle title={t('dhcp_settings')} />
{(dhcp.processing || dhcp.processingInterfaces) && <Loading />}
{!dhcp.processing && !dhcp.processingInterfaces && ( </s> remove }
</s> add }; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Dhcp/index.js |
}; | <mask> >
<mask> <Trans>dhcp_enable</Trans>
<mask> </button>
<mask> );
<mask> }
<mask>
<mask> getActiveDhcpMessage = (t, check) => {
<mask> const { found } = check.otherServer;
<mask>
<mask> if (found === DHCP_STATUS_RESPONSE.ERROR) {
</s> + client: split settings page into several pages </s> remove }
</s> add }; </s> remove }
</s> add }; </s> remove }
</s> add }; </s> remove if (this.props.encryption.enabled) {
this.props.validateTlsConfig(this.props.encryption);
</s> add const { getTlsStatus, validateTlsConfig, encryption } = this.props;
getTlsStatus();
if (encryption.enabled) {
validateTlsConfig(encryption); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Dhcp/index.js |
}; | <mask> </div>
<mask> )}
<mask> </div>
<mask> );
<mask> }
<mask>
<mask> getDhcpWarning = (check) => {
<mask> if (check.otherServer.found === DHCP_STATUS_RESPONSE.NO) {
<mask> return '';
<mask> }
</s> + client: split settings page into several pages </s> remove }
</s> add }; </s> remove }
</s> add }; </s> remove }
</s> add }; </s> remove check.staticIP.static === DHCP_STATUS_RESPONSE.NO
&& check.staticIP.ip
&& interfaceName
</s> add check.staticIP.static === DHCP_STATUS_RESPONSE.NO &&
check.staticIP.ip &&
interfaceName | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Dhcp/index.js |
}; | <mask> <div className="text-danger">
<mask> <Trans>dhcp_warning</Trans>
<mask> </div>
<mask> );
<mask> }
<mask>
<mask> getStaticIpWarning = (t, check, interfaceName) => {
<mask> if (check.staticIP.static === DHCP_STATUS_RESPONSE.ERROR) {
<mask> return (
<mask> <Fragment>
</s> + client: split settings page into several pages </s> remove }
</s> add }; </s> remove }
</s> add }; </s> remove check.staticIP.static === DHCP_STATUS_RESPONSE.NO
&& check.staticIP.ip
&& interfaceName
</s> add check.staticIP.static === DHCP_STATUS_RESPONSE.NO &&
check.staticIP.ip &&
interfaceName </s> remove }
</s> add }; </s> remove this.props.getDhcpStatus();
this.props.getDhcpInterfaces();
this.props.getTlsStatus();
this.props.getAccessList();
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Dhcp/index.js |
<hr className="mt-4 mb-4" /> | <mask> <span>{check.staticIP.error}</span>
<mask> </Accordion>
<mask> </div>
<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
</s> + client: split settings page into several pages </s> remove check.staticIP.static === DHCP_STATUS_RESPONSE.NO
&& check.staticIP.ip
&& interfaceName
</s> add check.staticIP.static === DHCP_STATUS_RESPONSE.NO &&
check.staticIP.ip &&
interfaceName </s> remove <hr className="mt-4 mb-4"/>
</s> add <hr className="mt-4 mb-4" /> </s> remove }
</s> add }; </s> remove }
</s> add }; </s> remove }
</s> add }; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Dhcp/index.js |
check.staticIP.static === DHCP_STATUS_RESPONSE.NO &&
check.staticIP.ip &&
interfaceName | <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> && interfaceName
<mask> ) {
<mask> return (
<mask> <Fragment>
<mask> <div className="text-secondary mb-2">
<mask> <Trans
</s> + client: split settings page into several pages </s> remove <hr className="mt-4 mb-4"/>
</s> add <hr className="mt-4 mb-4" /> </s> remove <hr className="mt-4 mb-4"/>
</s> add <hr className="mt-4 mb-4" /> </s> remove components={[
<strong key="0">example</strong>,
]}
</s> add components={[<strong key="0">example</strong>]} </s> remove }
</s> add }; </s> remove }
</s> add }; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Dhcp/index.js |
components={[<strong key="0">example</strong>]} | <mask> return (
<mask> <Fragment>
<mask> <div className="text-secondary mb-2">
<mask> <Trans
<mask> components={[
<mask> <strong key="0">example</strong>,
<mask> ]}
<mask> values={{
<mask> interfaceName,
<mask> ipAddress: check.staticIP.ip,
<mask> }}
<mask> >
</s> + client: split settings page into several pages </s> remove components={[<a href="https://letsencrypt.org/" key="0">link</a>]}
</s> add components={[
<a href="https://letsencrypt.org/" key="0">
link
</a>,
]} </s> remove check.staticIP.static === DHCP_STATUS_RESPONSE.NO
&& check.staticIP.ip
&& interfaceName
</s> add check.staticIP.static === DHCP_STATUS_RESPONSE.NO &&
check.staticIP.ip &&
interfaceName </s> remove <label className="form__label form__label--bold" htmlFor="certificate_chain">
</s> add <label
className="form__label form__label--bold"
htmlFor="certificate_chain"
> </s> remove : <Trans values={{ type: key_type }}>
</s> add ) : (
<Trans values={{ type: key_type }}> </s> remove {valid_key ?
</s> add {valid_key ? ( | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Dhcp/index.js |
<hr className="mt-4 mb-4" /> | <mask> >
<mask> dhcp_dynamic_ip_found
<mask> </Trans>
<mask> </div>
<mask> <hr className="mt-4 mb-4"/>
<mask> </Fragment>
<mask> );
<mask> }
<mask>
<mask> return '';
</s> + client: split settings page into several pages </s> remove <hr className="mt-4 mb-4"/>
</s> add <hr className="mt-4 mb-4" /> </s> remove check.staticIP.static === DHCP_STATUS_RESPONSE.NO
&& check.staticIP.ip
&& interfaceName
</s> add check.staticIP.static === DHCP_STATUS_RESPONSE.NO &&
check.staticIP.ip &&
interfaceName </s> remove }
</s> add }; </s> remove }
</s> add )} </s> remove }
</s> add }; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Dhcp/index.js |
}; | <mask> );
<mask> }
<mask>
<mask> return '';
<mask> }
<mask>
<mask> render() {
<mask> const { t, dhcp } = this.props;
<mask> const statusButtonClass = classnames({
<mask> 'btn btn-primary btn-standard': true,
</s> + client: split settings page into several pages </s> remove const {
enabled,
interface_name,
...values
} = dhcp.config;
</s> add const { enabled, interface_name, ...values } = dhcp.config; </s> remove const {
settings, dashboard, clients, access, t,
} = this.props;
</s> add const { settings, t } = this.props; </s> remove const {
t,
clients,
isModalOpen,
modalType,
modalClientName,
toggleClientModal,
processingAdding,
processingUpdating,
} = this.props;
const currentClientData = this.getClient(modalClientName, clients);
</s> add const { dashboard, clients, t } = this.props; </s> remove }
</s> add }; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Dhcp/index.js |
const { enabled, interface_name, ...values } = dhcp.config; | <mask> const statusButtonClass = classnames({
<mask> 'btn btn-primary btn-standard': true,
<mask> 'btn btn-primary btn-standard btn-loading': dhcp.processingStatus,
<mask> });
<mask> const {
<mask> enabled,
<mask> interface_name,
<mask> ...values
<mask> } = dhcp.config;
<mask>
<mask> return (
<mask> <Fragment>
<mask> <Card title={ t('dhcp_title') } subtitle={ t('dhcp_description') } bodyType="card-body box-body--settings">
<mask> <div className="dhcp">
</s> + client: split settings page into several pages </s> remove }
</s> add }; </s> remove <Card title={ t('dhcp_title') } subtitle={ t('dhcp_description') } bodyType="card-body box-body--settings">
<div className="dhcp">
{!dhcp.processing &&
<Fragment>
<Form
onSubmit={this.handleFormSubmit}
initialValues={{
interface_name,
...values,
}}
interfaces={dhcp.interfaces}
processingConfig={dhcp.processingConfig}
processingInterfaces={dhcp.processingInterfaces}
enabled={enabled}
/>
<hr/>
<div className="card-actions mb-3">
{this.getToggleDhcpButton()}
<button
type="button"
className={statusButtonClass}
onClick={() =>
this.props.findActiveDhcp(interface_name)
}
disabled={
enabled
|| !interface_name
|| dhcp.processingConfig
}
>
<Trans>check_dhcp_servers</Trans>
</button>
</div>
{!enabled && dhcp.check &&
<Fragment>
{this.getStaticIpWarning(t, dhcp.check, interface_name)}
{this.getActiveDhcpMessage(t, dhcp.check)}
{this.getDhcpWarning(dhcp.check)}
</Fragment>
}
</Fragment>
}
</div>
</Card>
{!dhcp.processing && dhcp.config.enabled &&
</s> add <PageTitle title={t('dhcp_settings')} />
{(dhcp.processing || dhcp.processingInterfaces) && <Loading />}
{!dhcp.processing && !dhcp.processingInterfaces && ( </s> remove <Card title={ t('dhcp_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<Leases leases={dhcp.leases} />
</div>
</div>
</Card>
<Card title={ t('dhcp_static_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col-12">
<StaticLeases
staticLeases={dhcp.staticLeases}
isModalOpen={dhcp.isModalOpen}
addStaticLease={this.props.addStaticLease}
removeStaticLease={this.props.removeStaticLease}
toggleLeaseModal={this.props.toggleLeaseModal}
processingAdding={dhcp.processingAdding}
processingDeleting={dhcp.processingDeleting}
</s> add <Card
title={t('dhcp_title')}
subtitle={t('dhcp_description')}
bodyType="card-body box-body--settings"
>
<div className="dhcp">
<Fragment>
<Form
onSubmit={this.handleFormSubmit}
initialValues={{
interface_name,
...values,
}}
interfaces={dhcp.interfaces}
processingConfig={dhcp.processingConfig}
processingInterfaces={dhcp.processingInterfaces}
enabled={enabled} </s> remove }
</s> add }; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Dhcp/index.js |
<PageTitle title={t('dhcp_settings')} />
{(dhcp.processing || dhcp.processingInterfaces) && <Loading />}
{!dhcp.processing && !dhcp.processingInterfaces && ( | <mask> } = dhcp.config;
<mask>
<mask> return (
<mask> <Fragment>
<mask> <Card title={ t('dhcp_title') } subtitle={ t('dhcp_description') } bodyType="card-body box-body--settings">
<mask> <div className="dhcp">
<mask> {!dhcp.processing &&
<mask> <Fragment>
<mask> <Form
<mask> onSubmit={this.handleFormSubmit}
<mask> initialValues={{
<mask> interface_name,
<mask> ...values,
<mask> }}
<mask> interfaces={dhcp.interfaces}
<mask> processingConfig={dhcp.processingConfig}
<mask> processingInterfaces={dhcp.processingInterfaces}
<mask> enabled={enabled}
<mask> />
<mask> <hr/>
<mask> <div className="card-actions mb-3">
<mask> {this.getToggleDhcpButton()}
<mask> <button
<mask> type="button"
<mask> className={statusButtonClass}
<mask> onClick={() =>
<mask> this.props.findActiveDhcp(interface_name)
<mask> }
<mask> disabled={
<mask> enabled
<mask> || !interface_name
<mask> || dhcp.processingConfig
<mask> }
<mask> >
<mask> <Trans>check_dhcp_servers</Trans>
<mask> </button>
<mask> </div>
<mask> {!enabled && dhcp.check &&
<mask> <Fragment>
<mask> {this.getStaticIpWarning(t, dhcp.check, interface_name)}
<mask> {this.getActiveDhcpMessage(t, dhcp.check)}
<mask> {this.getDhcpWarning(dhcp.check)}
<mask> </Fragment>
<mask> }
<mask> </Fragment>
<mask> }
<mask> </div>
<mask> </Card>
<mask> {!dhcp.processing && dhcp.config.enabled &&
<mask> <Fragment>
<mask> <Card title={ t('dhcp_leases') } bodyType="card-body box-body--settings">
<mask> <div className="row">
<mask> <div className="col">
<mask> <Leases leases={dhcp.leases} />
</s> + client: split settings page into several pages </s> remove <Card title={ t('dhcp_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<Leases leases={dhcp.leases} />
</div>
</div>
</Card>
<Card title={ t('dhcp_static_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col-12">
<StaticLeases
staticLeases={dhcp.staticLeases}
isModalOpen={dhcp.isModalOpen}
addStaticLease={this.props.addStaticLease}
removeStaticLease={this.props.removeStaticLease}
toggleLeaseModal={this.props.toggleLeaseModal}
processingAdding={dhcp.processingAdding}
processingDeleting={dhcp.processingDeleting}
</s> add <Card
title={t('dhcp_title')}
subtitle={t('dhcp_description')}
bodyType="card-body box-body--settings"
>
<div className="dhcp">
<Fragment>
<Form
onSubmit={this.handleFormSubmit}
initialValues={{
interface_name,
...values,
}}
interfaces={dhcp.interfaces}
processingConfig={dhcp.processingConfig}
processingInterfaces={dhcp.processingInterfaces}
enabled={enabled} </s> remove </div>
<div className="col-12">
<button
type="button"
className="btn btn-success btn-standard mt-3"
onClick={() => this.props.toggleLeaseModal()}
>
<Trans>dhcp_add_static_lease</Trans>
</button>
</div>
</s> add <hr />
<div className="card-actions mb-3">
{this.getToggleDhcpButton()}
<button
type="button"
className={statusButtonClass}
onClick={() =>
this.props.findActiveDhcp(interface_name)
}
disabled={
enabled || !interface_name || dhcp.processingConfig
}
>
<Trans>check_dhcp_servers</Trans>
</button>
</div>
{!enabled && dhcp.check && (
<Fragment>
{this.getStaticIpWarning(t, dhcp.check, interface_name)}
{this.getActiveDhcpMessage(t, dhcp.check)}
{this.getDhcpWarning(dhcp.check)}
</Fragment>
)}
</Fragment> </s> remove const {
enabled,
interface_name,
...values
} = dhcp.config;
</s> add const { enabled, interface_name, ...values } = dhcp.config; </s> remove <Card
title={t('clients_title')}
subtitle={t('clients_desc')}
bodyType="card-body box-body--settings"
>
<Fragment>
<ReactTable
data={clients || []}
columns={this.columns}
className="-striped -highlight card-table-overflow"
showPagination={true}
defaultPageSize={10}
minRows={5}
previousText={t('previous_btn')}
nextText={t('next_btn')}
loadingText={t('loading_table_status')}
pageText={t('page_table_footer_text')}
ofText={t('of_table_footer_text')}
rowsText={t('rows_table_footer_text')}
noDataText={t('clients_not_found')}
/>
<button
type="button"
className="btn btn-success btn-standard mt-3"
onClick={() => toggleClientModal(MODAL_TYPE.ADD)}
disabled={processingAdding}
>
<Trans>client_add</Trans>
</button>
<Modal
isModalOpen={isModalOpen}
modalType={modalType}
toggleClientModal={toggleClientModal}
currentClientData={currentClientData}
handleSubmit={this.handleSubmit}
processingAdding={processingAdding}
processingUpdating={processingUpdating}
/>
</Fragment>
</Card>
</s> add <Fragment>
<PageTitle title={t('clients_settings')} />
{!dashboard.processingTopStats || (!dashboard.processingClients && <Loading />)}
{!dashboard.processingTopStats && !dashboard.processingClients && (
<Fragment>
<ClientsTable
clients={dashboard.clients}
topStats={dashboard.topStats}
isModalOpen={clients.isModalOpen}
modalClientName={clients.modalClientName}
modalType={clients.modalType}
addClient={this.props.addClient}
updateClient={this.props.updateClient}
deleteClient={this.props.deleteClient}
toggleClientModal={this.props.toggleClientModal}
processingAdding={clients.processingAdding}
processingDeleting={clients.processingDeleting}
processingUpdating={clients.processingUpdating}
/>
<AutoClients
autoClients={dashboard.autoClients}
topStats={dashboard.topStats}
/>
</Fragment>
)}
</Fragment> </s> remove <Card
title={t('general_settings')}
bodyType="card-body box-body--settings"
>
</s> add <Card bodyType="card-body box-body--settings"> | [
"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/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Dhcp/index.js |
<Card
title={t('dhcp_title')}
subtitle={t('dhcp_description')}
bodyType="card-body box-body--settings"
>
<div className="dhcp">
<Fragment>
<Form
onSubmit={this.handleFormSubmit}
initialValues={{
interface_name,
...values,
}}
interfaces={dhcp.interfaces}
processingConfig={dhcp.processingConfig}
processingInterfaces={dhcp.processingInterfaces}
enabled={enabled} | <mask> </div>
<mask> </Card>
<mask> {!dhcp.processing && dhcp.config.enabled &&
<mask> <Fragment>
<mask> <Card title={ t('dhcp_leases') } bodyType="card-body box-body--settings">
<mask> <div className="row">
<mask> <div className="col">
<mask> <Leases leases={dhcp.leases} />
<mask> </div>
<mask> </div>
<mask> </Card>
<mask> <Card title={ t('dhcp_static_leases') } bodyType="card-body box-body--settings">
<mask> <div className="row">
<mask> <div className="col-12">
<mask> <StaticLeases
<mask> staticLeases={dhcp.staticLeases}
<mask> isModalOpen={dhcp.isModalOpen}
<mask> addStaticLease={this.props.addStaticLease}
<mask> removeStaticLease={this.props.removeStaticLease}
<mask> toggleLeaseModal={this.props.toggleLeaseModal}
<mask> processingAdding={dhcp.processingAdding}
<mask> processingDeleting={dhcp.processingDeleting}
<mask> />
<mask> </div>
<mask> <div className="col-12">
<mask> <button
<mask> type="button"
</s> + client: split settings page into several pages </s> remove <Card title={ t('dhcp_title') } subtitle={ t('dhcp_description') } bodyType="card-body box-body--settings">
<div className="dhcp">
{!dhcp.processing &&
<Fragment>
<Form
onSubmit={this.handleFormSubmit}
initialValues={{
interface_name,
...values,
}}
interfaces={dhcp.interfaces}
processingConfig={dhcp.processingConfig}
processingInterfaces={dhcp.processingInterfaces}
enabled={enabled}
/>
<hr/>
<div className="card-actions mb-3">
{this.getToggleDhcpButton()}
<button
type="button"
className={statusButtonClass}
onClick={() =>
this.props.findActiveDhcp(interface_name)
}
disabled={
enabled
|| !interface_name
|| dhcp.processingConfig
}
>
<Trans>check_dhcp_servers</Trans>
</button>
</div>
{!enabled && dhcp.check &&
<Fragment>
{this.getStaticIpWarning(t, dhcp.check, interface_name)}
{this.getActiveDhcpMessage(t, dhcp.check)}
{this.getDhcpWarning(dhcp.check)}
</Fragment>
}
</Fragment>
}
</div>
</Card>
{!dhcp.processing && dhcp.config.enabled &&
</s> add <PageTitle title={t('dhcp_settings')} />
{(dhcp.processing || dhcp.processingInterfaces) && <Loading />}
{!dhcp.processing && !dhcp.processingInterfaces && ( </s> remove <Card
title={t('general_settings')}
bodyType="card-body box-body--settings"
>
</s> add <Card bodyType="card-body box-body--settings"> </s> remove </div>
<div className="col-12">
<button
type="button"
className="btn btn-success btn-standard mt-3"
onClick={() => this.props.toggleLeaseModal()}
>
<Trans>dhcp_add_static_lease</Trans>
</button>
</div>
</s> add <hr />
<div className="card-actions mb-3">
{this.getToggleDhcpButton()}
<button
type="button"
className={statusButtonClass}
onClick={() =>
this.props.findActiveDhcp(interface_name)
}
disabled={
enabled || !interface_name || dhcp.processingConfig
}
>
<Trans>check_dhcp_servers</Trans>
</button>
</div>
{!enabled && dhcp.check && (
<Fragment>
{this.getStaticIpWarning(t, dhcp.check, interface_name)}
{this.getActiveDhcpMessage(t, dhcp.check)}
{this.getDhcpWarning(dhcp.check)}
</Fragment>
)}
</Fragment> </s> remove const {
enabled,
interface_name,
...values
} = dhcp.config;
</s> add const { enabled, interface_name, ...values } = dhcp.config; </s> remove <Upstream
upstreamDns={dashboard.upstreamDns}
bootstrapDns={dashboard.bootstrapDns}
allServers={dashboard.allServers}
setUpstream={this.props.setUpstream}
testUpstream={this.props.testUpstream}
processingTestUpstream={settings.processingTestUpstream}
processingSetUpstream={settings.processingSetUpstream}
/>
{!dashboard.processingTopStats && !dashboard.processingClients && (
<Fragment>
<Clients
clients={dashboard.clients}
topStats={dashboard.topStats}
isModalOpen={clients.isModalOpen}
modalClientName={clients.modalClientName}
modalType={clients.modalType}
addClient={this.props.addClient}
updateClient={this.props.updateClient}
deleteClient={this.props.deleteClient}
toggleClientModal={this.props.toggleClientModal}
processingAdding={clients.processingAdding}
processingDeleting={clients.processingDeleting}
processingUpdating={clients.processingUpdating}
/>
<AutoClients
autoClients={dashboard.autoClients}
topStats={dashboard.topStats}
/>
</Fragment>
)}
<Access access={access} setAccessList={this.props.setAccessList} />
<Encryption
encryption={this.props.encryption}
setTlsConfig={this.props.setTlsConfig}
validateTlsConfig={this.props.validateTlsConfig}
/>
<Dhcp
dhcp={this.props.dhcp}
toggleDhcp={this.props.toggleDhcp}
getDhcpStatus={this.props.getDhcpStatus}
findActiveDhcp={this.props.findActiveDhcp}
setDhcpConfig={this.props.setDhcpConfig}
addStaticLease={this.props.addStaticLease}
removeStaticLease={this.props.removeStaticLease}
toggleLeaseModal={this.props.toggleLeaseModal}
/>
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"k... | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Dhcp/index.js |
<hr />
<div className="card-actions mb-3">
{this.getToggleDhcpButton()}
<button
type="button"
className={statusButtonClass}
onClick={() =>
this.props.findActiveDhcp(interface_name)
}
disabled={
enabled || !interface_name || dhcp.processingConfig
}
>
<Trans>check_dhcp_servers</Trans>
</button>
</div>
{!enabled && dhcp.check && (
<Fragment>
{this.getStaticIpWarning(t, dhcp.check, interface_name)}
{this.getActiveDhcpMessage(t, dhcp.check)}
{this.getDhcpWarning(dhcp.check)}
</Fragment>
)}
</Fragment> | <mask> toggleLeaseModal={this.props.toggleLeaseModal}
<mask> processingAdding={dhcp.processingAdding}
<mask> processingDeleting={dhcp.processingDeleting}
<mask> />
<mask> </div>
<mask> <div className="col-12">
<mask> <button
<mask> type="button"
<mask> className="btn btn-success btn-standard mt-3"
<mask> onClick={() => this.props.toggleLeaseModal()}
<mask> >
<mask> <Trans>dhcp_add_static_lease</Trans>
<mask> </button>
<mask> </div>
<mask> </div>
<mask> </Card>
<mask> </Fragment>
<mask> }
<mask> </Fragment>
</s> + client: split settings page into several pages </s> remove <Card title={ t('dhcp_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<Leases leases={dhcp.leases} />
</div>
</div>
</Card>
<Card title={ t('dhcp_static_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col-12">
<StaticLeases
staticLeases={dhcp.staticLeases}
isModalOpen={dhcp.isModalOpen}
addStaticLease={this.props.addStaticLease}
removeStaticLease={this.props.removeStaticLease}
toggleLeaseModal={this.props.toggleLeaseModal}
processingAdding={dhcp.processingAdding}
processingDeleting={dhcp.processingDeleting}
</s> add <Card
title={t('dhcp_title')}
subtitle={t('dhcp_description')}
bodyType="card-body box-body--settings"
>
<div className="dhcp">
<Fragment>
<Form
onSubmit={this.handleFormSubmit}
initialValues={{
interface_name,
...values,
}}
interfaces={dhcp.interfaces}
processingConfig={dhcp.processingConfig}
processingInterfaces={dhcp.processingInterfaces}
enabled={enabled} </s> remove <Card
title={t('clients_title')}
subtitle={t('clients_desc')}
bodyType="card-body box-body--settings"
>
<Fragment>
<ReactTable
data={clients || []}
columns={this.columns}
className="-striped -highlight card-table-overflow"
showPagination={true}
defaultPageSize={10}
minRows={5}
previousText={t('previous_btn')}
nextText={t('next_btn')}
loadingText={t('loading_table_status')}
pageText={t('page_table_footer_text')}
ofText={t('of_table_footer_text')}
rowsText={t('rows_table_footer_text')}
noDataText={t('clients_not_found')}
/>
<button
type="button"
className="btn btn-success btn-standard mt-3"
onClick={() => toggleClientModal(MODAL_TYPE.ADD)}
disabled={processingAdding}
>
<Trans>client_add</Trans>
</button>
<Modal
isModalOpen={isModalOpen}
modalType={modalType}
toggleClientModal={toggleClientModal}
currentClientData={currentClientData}
handleSubmit={this.handleSubmit}
processingAdding={processingAdding}
processingUpdating={processingUpdating}
/>
</Fragment>
</Card>
</s> add <Fragment>
<PageTitle title={t('clients_settings')} />
{!dashboard.processingTopStats || (!dashboard.processingClients && <Loading />)}
{!dashboard.processingTopStats && !dashboard.processingClients && (
<Fragment>
<ClientsTable
clients={dashboard.clients}
topStats={dashboard.topStats}
isModalOpen={clients.isModalOpen}
modalClientName={clients.modalClientName}
modalType={clients.modalType}
addClient={this.props.addClient}
updateClient={this.props.updateClient}
deleteClient={this.props.deleteClient}
toggleClientModal={this.props.toggleClientModal}
processingAdding={clients.processingAdding}
processingDeleting={clients.processingDeleting}
processingUpdating={clients.processingUpdating}
/>
<AutoClients
autoClients={dashboard.autoClients}
topStats={dashboard.topStats}
/>
</Fragment>
)}
</Fragment> </s> remove !filledConfig
|| !check
|| otherDhcpFound
|| processingDhcp
|| processingConfig
</s> add !filledConfig || !check || otherDhcpFound || processingDhcp || processingConfig </s> remove <Card title={ t('dhcp_title') } subtitle={ t('dhcp_description') } bodyType="card-body box-body--settings">
<div className="dhcp">
{!dhcp.processing &&
<Fragment>
<Form
onSubmit={this.handleFormSubmit}
initialValues={{
interface_name,
...values,
}}
interfaces={dhcp.interfaces}
processingConfig={dhcp.processingConfig}
processingInterfaces={dhcp.processingInterfaces}
enabled={enabled}
/>
<hr/>
<div className="card-actions mb-3">
{this.getToggleDhcpButton()}
<button
type="button"
className={statusButtonClass}
onClick={() =>
this.props.findActiveDhcp(interface_name)
}
disabled={
enabled
|| !interface_name
|| dhcp.processingConfig
}
>
<Trans>check_dhcp_servers</Trans>
</button>
</div>
{!enabled && dhcp.check &&
<Fragment>
{this.getStaticIpWarning(t, dhcp.check, interface_name)}
{this.getActiveDhcpMessage(t, dhcp.check)}
{this.getDhcpWarning(dhcp.check)}
</Fragment>
}
</Fragment>
}
</div>
</Card>
{!dhcp.processing && dhcp.config.enabled &&
</s> add <PageTitle title={t('dhcp_settings')} />
{(dhcp.processing || dhcp.processingInterfaces) && <Loading />}
{!dhcp.processing && !dhcp.processingInterfaces && ( </s> remove }
</s> add )} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Dhcp/index.js |
)} | <mask> </div>
<mask> </div>
<mask> </Card>
<mask> </Fragment>
<mask> }
<mask> </Fragment>
<mask> );
<mask> }
<mask> }
<mask>
</s> + client: split settings page into several pages </s> remove }
</s> add )} </s> remove }
</s> add )} </s> remove }
</s> add )} </s> remove </div>
<div className="col-12">
<button
type="button"
className="btn btn-success btn-standard mt-3"
onClick={() => this.props.toggleLeaseModal()}
>
<Trans>dhcp_add_static_lease</Trans>
</button>
</div>
</s> add <hr />
<div className="card-actions mb-3">
{this.getToggleDhcpButton()}
<button
type="button"
className={statusButtonClass}
onClick={() =>
this.props.findActiveDhcp(interface_name)
}
disabled={
enabled || !interface_name || dhcp.processingConfig
}
>
<Trans>check_dhcp_servers</Trans>
</button>
</div>
{!enabled && dhcp.check && (
<Fragment>
{this.getStaticIpWarning(t, dhcp.check, interface_name)}
{this.getActiveDhcpMessage(t, dhcp.check)}
{this.getDhcpWarning(dhcp.check)}
</Fragment>
)}
</Fragment> </s> remove <hr className="mt-4 mb-4"/>
</s> add <hr className="mt-4 mb-4" /> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Dhcp/index.js |
<mask> toggleDhcp: PropTypes.func,
<mask> getDhcpStatus: PropTypes.func,
<mask> setDhcpConfig: PropTypes.func,
<mask> findActiveDhcp: PropTypes.func,
<mask> handleSubmit: PropTypes.func,
<mask> addStaticLease: PropTypes.func,
<mask> removeStaticLease: PropTypes.func,
<mask> toggleLeaseModal: PropTypes.func,
<mask> t: PropTypes.func,
<mask> };
</s> + client: split settings page into several pages </s> remove handleUpstreamChange: PropTypes.func,
setUpstream: PropTypes.func,
</s> add </s> remove }
</s> add }; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Dhcp/index.js | |
getDhcpInterfaces: PropTypes.func, | <mask> addStaticLease: PropTypes.func,
<mask> removeStaticLease: PropTypes.func,
<mask> toggleLeaseModal: PropTypes.func,
<mask> t: PropTypes.func,
<mask> };
<mask>
<mask> export default withNamespaces()(Dhcp);
</s> + client: split settings page into several pages </s> remove handleSubmit: PropTypes.func,
</s> add </s> remove handleUpstreamChange: PropTypes.func,
setUpstream: PropTypes.func,
</s> add </s> remove }
</s> add }; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Dhcp/index.js |
const isSavingDisabled =
invalid ||
submitting ||
processingConfig ||
processingValidate ||
(isEnabled && (!privateKey || !certificateChain)) ||
(privateKey && !valid_key) ||
(certificateChain && !valid_cert) ||
(privateKey && certificateChain && !valid_pair); | <mask> warning_validation,
<mask> setTlsConfig,
<mask> } = props;
<mask>
<mask> const isSavingDisabled = invalid
<mask> || submitting
<mask> || processingConfig
<mask> || processingValidate
<mask> || (isEnabled && (!privateKey || !certificateChain))
<mask> || (privateKey && !valid_key)
<mask> || (certificateChain && !valid_cert)
<mask> || (privateKey && certificateChain && !valid_pair);
<mask>
<mask> return (
<mask> <form onSubmit={handleSubmit}>
<mask> <div className="row">
<mask> <div className="col-12">
</s> + client: split settings page into several pages </s> remove !filledConfig
|| !check
|| otherDhcpFound
|| processingDhcp
|| processingConfig
</s> add !filledConfig || !check || otherDhcpFound || processingDhcp || processingConfig </s> remove <Card title={ t('dhcp_title') } subtitle={ t('dhcp_description') } bodyType="card-body box-body--settings">
<div className="dhcp">
{!dhcp.processing &&
<Fragment>
<Form
onSubmit={this.handleFormSubmit}
initialValues={{
interface_name,
...values,
}}
interfaces={dhcp.interfaces}
processingConfig={dhcp.processingConfig}
processingInterfaces={dhcp.processingInterfaces}
enabled={enabled}
/>
<hr/>
<div className="card-actions mb-3">
{this.getToggleDhcpButton()}
<button
type="button"
className={statusButtonClass}
onClick={() =>
this.props.findActiveDhcp(interface_name)
}
disabled={
enabled
|| !interface_name
|| dhcp.processingConfig
}
>
<Trans>check_dhcp_servers</Trans>
</button>
</div>
{!enabled && dhcp.check &&
<Fragment>
{this.getStaticIpWarning(t, dhcp.check, interface_name)}
{this.getActiveDhcpMessage(t, dhcp.check)}
{this.getDhcpWarning(dhcp.check)}
</Fragment>
}
</Fragment>
}
</div>
</Card>
{!dhcp.processing && dhcp.config.enabled &&
</s> add <PageTitle title={t('dhcp_settings')} />
{(dhcp.processing || dhcp.processingInterfaces) && <Loading />}
{!dhcp.processing && !dhcp.processingInterfaces && ( </s> remove </div>
<div className="col-12">
<button
type="button"
className="btn btn-success btn-standard mt-3"
onClick={() => this.props.toggleLeaseModal()}
>
<Trans>dhcp_add_static_lease</Trans>
</button>
</div>
</s> add <hr />
<div className="card-actions mb-3">
{this.getToggleDhcpButton()}
<button
type="button"
className={statusButtonClass}
onClick={() =>
this.props.findActiveDhcp(interface_name)
}
disabled={
enabled || !interface_name || dhcp.processingConfig
}
>
<Trans>check_dhcp_servers</Trans>
</button>
</div>
{!enabled && dhcp.check && (
<Fragment>
{this.getStaticIpWarning(t, dhcp.check, interface_name)}
{this.getActiveDhcpMessage(t, dhcp.check)}
{this.getDhcpWarning(dhcp.check)}
</Fragment>
)}
</Fragment> </s> remove <Card
title={t('clients_title')}
subtitle={t('clients_desc')}
bodyType="card-body box-body--settings"
>
<Fragment>
<ReactTable
data={clients || []}
columns={this.columns}
className="-striped -highlight card-table-overflow"
showPagination={true}
defaultPageSize={10}
minRows={5}
previousText={t('previous_btn')}
nextText={t('next_btn')}
loadingText={t('loading_table_status')}
pageText={t('page_table_footer_text')}
ofText={t('of_table_footer_text')}
rowsText={t('rows_table_footer_text')}
noDataText={t('clients_not_found')}
/>
<button
type="button"
className="btn btn-success btn-standard mt-3"
onClick={() => toggleClientModal(MODAL_TYPE.ADD)}
disabled={processingAdding}
>
<Trans>client_add</Trans>
</button>
<Modal
isModalOpen={isModalOpen}
modalType={modalType}
toggleClientModal={toggleClientModal}
currentClientData={currentClientData}
handleSubmit={this.handleSubmit}
processingAdding={processingAdding}
processingUpdating={processingUpdating}
/>
</Fragment>
</Card>
</s> add <Fragment>
<PageTitle title={t('clients_settings')} />
{!dashboard.processingTopStats || (!dashboard.processingClients && <Loading />)}
{!dashboard.processingTopStats && !dashboard.processingClients && (
<Fragment>
<ClientsTable
clients={dashboard.clients}
topStats={dashboard.topStats}
isModalOpen={clients.isModalOpen}
modalClientName={clients.modalClientName}
modalType={clients.modalType}
addClient={this.props.addClient}
updateClient={this.props.updateClient}
deleteClient={this.props.deleteClient}
toggleClientModal={this.props.toggleClientModal}
processingAdding={clients.processingAdding}
processingDeleting={clients.processingDeleting}
processingUpdating={clients.processingUpdating}
/>
<AutoClients
autoClients={dashboard.autoClients}
topStats={dashboard.topStats}
/>
</Fragment>
)}
</Fragment> </s> remove <PageTitle title={t('settings')} />
</s> add <PageTitle title={t('general_settings')} /> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Encryption/Form.js |
<hr /> | <mask> </div>
<mask> <div className="form__desc">
<mask> <Trans>encryption_enable_desc</Trans>
<mask> </div>
<mask> <hr/>
<mask> </div>
<mask> <div className="col-12">
<mask> <label className="form__label" htmlFor="server_name">
<mask> <Trans>encryption_server</Trans>
<mask> </label>
</s> + client: split settings page into several pages </s> remove <label className="form__label form__label--bold" htmlFor="certificate_chain">
</s> add <label
className="form__label form__label--bold"
htmlFor="certificate_chain"
> </s> remove <p className="text-danger">
{warning_validation}
</p>
</s> add <p className="text-danger">{warning_validation}</p> </s> remove }
</s> add )} </s> remove {warning_validation &&
</s> add {warning_validation && ( </s> remove <Card title={ t('dhcp_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<Leases leases={dhcp.leases} />
</div>
</div>
</Card>
<Card title={ t('dhcp_static_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col-12">
<StaticLeases
staticLeases={dhcp.staticLeases}
isModalOpen={dhcp.isModalOpen}
addStaticLease={this.props.addStaticLease}
removeStaticLease={this.props.removeStaticLease}
toggleLeaseModal={this.props.toggleLeaseModal}
processingAdding={dhcp.processingAdding}
processingDeleting={dhcp.processingDeleting}
</s> add <Card
title={t('dhcp_title')}
subtitle={t('dhcp_description')}
bodyType="card-body box-body--settings"
>
<div className="dhcp">
<Fragment>
<Form
onSubmit={this.handleFormSubmit}
initialValues={{
interface_name,
...values,
}}
interfaces={dhcp.interfaces}
processingConfig={dhcp.processingConfig}
processingInterfaces={dhcp.processingInterfaces}
enabled={enabled} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Encryption/Form.js |
<label
className="form__label form__label--bold"
htmlFor="certificate_chain"
> | <mask> </div>
<mask> <div className="row">
<mask> <div className="col-12">
<mask> <div className="form__group form__group--settings">
<mask> <label className="form__label form__label--bold" htmlFor="certificate_chain">
<mask> <Trans>encryption_certificates</Trans>
<mask> </label>
<mask> <div className="form__desc form__desc--top">
<mask> <Trans
<mask> values={{ link: 'letsencrypt.org' }}
</s> + client: split settings page into several pages </s> remove components={[<a href="https://letsencrypt.org/" key="0">link</a>]}
</s> add components={[
<a href="https://letsencrypt.org/" key="0">
link
</a>,
]} </s> remove <hr/>
</s> add <hr /> </s> remove components={[
<strong key="0">example</strong>,
]}
</s> add components={[<strong key="0">example</strong>]} </s> remove <Card title={ t('dhcp_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<Leases leases={dhcp.leases} />
</div>
</div>
</Card>
<Card title={ t('dhcp_static_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col-12">
<StaticLeases
staticLeases={dhcp.staticLeases}
isModalOpen={dhcp.isModalOpen}
addStaticLease={this.props.addStaticLease}
removeStaticLease={this.props.removeStaticLease}
toggleLeaseModal={this.props.toggleLeaseModal}
processingAdding={dhcp.processingAdding}
processingDeleting={dhcp.processingDeleting}
</s> add <Card
title={t('dhcp_title')}
subtitle={t('dhcp_description')}
bodyType="card-body box-body--settings"
>
<div className="dhcp">
<Fragment>
<Form
onSubmit={this.handleFormSubmit}
initialValues={{
interface_name,
...values,
}}
interfaces={dhcp.interfaces}
processingConfig={dhcp.processingConfig}
processingInterfaces={dhcp.processingInterfaces}
enabled={enabled} </s> remove {certificateChain &&
</s> add {certificateChain && ( | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Encryption/Form.js |
components={[
<a href="https://letsencrypt.org/" key="0">
link
</a>,
]} | <mask> </label>
<mask> <div className="form__desc form__desc--top">
<mask> <Trans
<mask> values={{ link: 'letsencrypt.org' }}
<mask> components={[<a href="https://letsencrypt.org/" key="0">link</a>]}
<mask> >
<mask> encryption_certificates_desc
<mask> </Trans>
<mask> </div>
<mask> <Field
</s> + client: split settings page into several pages </s> remove <label className="form__label form__label--bold" htmlFor="certificate_chain">
</s> add <label
className="form__label form__label--bold"
htmlFor="certificate_chain"
> </s> remove : <Trans values={{ type: key_type }}>
</s> add ) : (
<Trans values={{ type: key_type }}> </s> remove components={[
<strong key="0">example</strong>,
]}
</s> add components={[<strong key="0">example</strong>]} </s> remove }
</s> add )} </s> remove {valid_key ?
</s> add {valid_key ? ( | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Encryption/Form.js |
{certificateChain && ( | <mask> onChange={handleChange}
<mask> disabled={!isEnabled}
<mask> />
<mask> <div className="form__status">
<mask> {certificateChain &&
<mask> <Fragment>
<mask> <div className="form__label form__label--bold">
<mask> <Trans>encryption_status</Trans>:
<mask> </div>
<mask> <ul className="encryption__list">
</s> + client: split settings page into several pages </s> remove {privateKey &&
</s> add {privateKey && ( </s> remove <li className={valid_chain ? 'text-success' : 'text-danger'}>
{valid_chain ?
</s> add <li
className={valid_chain ? 'text-success' : 'text-danger'}
>
{valid_chain ? ( </s> remove {valid_key ?
</s> add {valid_key ? ( </s> remove <label className="form__label form__label--bold" htmlFor="certificate_chain">
</s> add <label
className="form__label form__label--bold"
htmlFor="certificate_chain"
> </s> remove : <Trans>encryption_chain_invalid</Trans>
}
</s> add ) : (
<Trans>encryption_chain_invalid</Trans>
)} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Encryption/Form.js |
<li
className={valid_chain ? 'text-success' : 'text-danger'}
>
{valid_chain ? ( | <mask> <div className="form__label form__label--bold">
<mask> <Trans>encryption_status</Trans>:
<mask> </div>
<mask> <ul className="encryption__list">
<mask> <li className={valid_chain ? 'text-success' : 'text-danger'}>
<mask> {valid_chain ?
<mask> <Trans>encryption_chain_valid</Trans>
<mask> : <Trans>encryption_chain_invalid</Trans>
<mask> }
<mask> </li>
<mask> {valid_cert &&
</s> + client: split settings page into several pages </s> remove : <Trans>encryption_chain_invalid</Trans>
}
</s> add ) : (
<Trans>encryption_chain_invalid</Trans>
)} </s> remove {valid_key ?
</s> add {valid_key ? ( </s> remove {valid_cert &&
</s> add {valid_cert && ( </s> remove {privateKey &&
</s> add {privateKey && ( </s> remove {certificateChain &&
</s> add {certificateChain && ( | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Encryption/Form.js |
) : (
<Trans>encryption_chain_invalid</Trans>
)} | <mask> <ul className="encryption__list">
<mask> <li className={valid_chain ? 'text-success' : 'text-danger'}>
<mask> {valid_chain ?
<mask> <Trans>encryption_chain_valid</Trans>
<mask> : <Trans>encryption_chain_invalid</Trans>
<mask> }
<mask> </li>
<mask> {valid_cert &&
<mask> <Fragment>
<mask> {subject &&
<mask> <li>
</s> + client: split settings page into several pages </s> remove <li className={valid_chain ? 'text-success' : 'text-danger'}>
{valid_chain ?
</s> add <li
className={valid_chain ? 'text-success' : 'text-danger'}
>
{valid_chain ? ( </s> remove {valid_cert &&
</s> add {valid_cert && ( </s> remove {valid_key ?
</s> add {valid_key ? ( </s> remove {subject &&
</s> add {subject && ( </s> remove : <Trans values={{ type: key_type }}>
</s> add ) : (
<Trans values={{ type: key_type }}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Encryption/Form.js |
{valid_cert && ( | <mask> <Trans>encryption_chain_valid</Trans>
<mask> : <Trans>encryption_chain_invalid</Trans>
<mask> }
<mask> </li>
<mask> {valid_cert &&
<mask> <Fragment>
<mask> {subject &&
<mask> <li>
<mask> <Trans>encryption_subject</Trans>:
<mask> {subject}
</s> + client: split settings page into several pages </s> remove {subject &&
</s> add {subject && ( </s> remove : <Trans>encryption_chain_invalid</Trans>
}
</s> add ) : (
<Trans>encryption_chain_invalid</Trans>
)} </s> remove }
{issuer &&
</s> add )}
{issuer && ( </s> remove <li className={valid_chain ? 'text-success' : 'text-danger'}>
{valid_chain ?
</s> add <li
className={valid_chain ? 'text-success' : 'text-danger'}
>
{valid_chain ? ( </s> remove }
{dns_names &&
</s> add )}
{dns_names && ( | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Encryption/Form.js |
{subject && ( | <mask> }
<mask> </li>
<mask> {valid_cert &&
<mask> <Fragment>
<mask> {subject &&
<mask> <li>
<mask> <Trans>encryption_subject</Trans>:
<mask> {subject}
<mask> </li>
<mask> }
</s> + client: split settings page into several pages </s> remove {valid_cert &&
</s> add {valid_cert && ( </s> remove }
{issuer &&
</s> add )}
{issuer && ( </s> remove : <Trans>encryption_chain_invalid</Trans>
}
</s> add ) : (
<Trans>encryption_chain_invalid</Trans>
)} </s> remove }
{dns_names &&
</s> add )}
{dns_names && ( </s> remove }
{not_after && not_after !== EMPTY_DATE &&
</s> add )}
{not_after && not_after !== EMPTY_DATE && ( | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Encryption/Form.js |
)}
{issuer && ( | <mask> <li>
<mask> <Trans>encryption_subject</Trans>:
<mask> {subject}
<mask> </li>
<mask> }
<mask> {issuer &&
<mask> <li>
<mask> <Trans>encryption_issuer</Trans>:
<mask> {issuer}
<mask> </li>
<mask> }
</s> + client: split settings page into several pages </s> remove {subject &&
</s> add {subject && ( </s> remove }
{not_after && not_after !== EMPTY_DATE &&
</s> add )}
{not_after && not_after !== EMPTY_DATE && ( </s> remove {valid_cert &&
</s> add {valid_cert && ( </s> remove }
{dns_names &&
</s> add )}
{dns_names && ( </s> remove }
</s> add )} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Encryption/Form.js |
)}
{not_after && not_after !== EMPTY_DATE && ( | <mask> <li>
<mask> <Trans>encryption_issuer</Trans>:
<mask> {issuer}
<mask> </li>
<mask> }
<mask> {not_after && not_after !== EMPTY_DATE &&
<mask> <li>
<mask> <Trans>encryption_expire</Trans>:
<mask> {format(not_after, 'YYYY-MM-DD HH:mm:ss')}
<mask> </li>
<mask> }
</s> + client: split settings page into several pages </s> remove }
{dns_names &&
</s> add )}
{dns_names && ( </s> remove }
{issuer &&
</s> add )}
{issuer && ( </s> remove {subject &&
</s> add {subject && ( </s> remove }
</s> add )} </s> remove {valid_cert &&
</s> add {valid_cert && ( | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Encryption/Form.js |
)}
{dns_names && ( | <mask> <li>
<mask> <Trans>encryption_expire</Trans>:
<mask> {format(not_after, 'YYYY-MM-DD HH:mm:ss')}
<mask> </li>
<mask> }
<mask> {dns_names &&
<mask> <li>
<mask> <Trans>encryption_hostnames</Trans>:
<mask> {dns_names}
<mask> </li>
<mask> }
</s> + client: split settings page into several pages </s> remove }
{not_after && not_after !== EMPTY_DATE &&
</s> add )}
{not_after && not_after !== EMPTY_DATE && ( </s> remove }
</s> add )} </s> remove }
{issuer &&
</s> add )}
{issuer && ( </s> remove {subject &&
</s> add {subject && ( </s> remove {valid_cert &&
</s> add {valid_cert && ( | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Encryption/Form.js |
)} | <mask> <li>
<mask> <Trans>encryption_hostnames</Trans>:
<mask> {dns_names}
<mask> </li>
<mask> }
<mask> </Fragment>
<mask> }
<mask> </ul>
<mask> </Fragment>
<mask> }
</s> + client: split settings page into several pages </s> remove }
</s> add )} </s> remove }
{dns_names &&
</s> add )}
{dns_names && ( </s> remove }
</s> add )} </s> remove }
</s> add )} </s> remove }
</s> add )} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Encryption/Form.js |
)} | <mask> {dns_names}
<mask> </li>
<mask> }
<mask> </Fragment>
<mask> }
<mask> </ul>
<mask> </Fragment>
<mask> }
<mask> </div>
<mask> </div>
</s> + client: split settings page into several pages </s> remove }
</s> add )} </s> remove }
</s> add )} </s> remove }
</s> add )} </s> remove }
</s> add )} </s> remove }
</s> add )} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Encryption/Form.js |
)} | <mask> </Fragment>
<mask> }
<mask> </ul>
<mask> </Fragment>
<mask> }
<mask> </div>
<mask> </div>
<mask> </div>
<mask> </div>
<mask> <div className="row">
</s> + client: split settings page into several pages </s> remove }
</s> add )} </s> remove }
</s> add )} </s> remove }
</s> add )} </s> remove }
</s> add )} </s> remove }
</s> add )} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Encryption/Form.js |
{privateKey && ( | <mask> onChange={handleChange}
<mask> disabled={!isEnabled}
<mask> />
<mask> <div className="form__status">
<mask> {privateKey &&
<mask> <Fragment>
<mask> <div className="form__label form__label--bold">
<mask> <Trans>encryption_status</Trans>:
<mask> </div>
<mask> <ul className="encryption__list">
</s> + client: split settings page into several pages </s> remove {certificateChain &&
</s> add {certificateChain && ( </s> remove <li className={valid_chain ? 'text-success' : 'text-danger'}>
{valid_chain ?
</s> add <li
className={valid_chain ? 'text-success' : 'text-danger'}
>
{valid_chain ? ( </s> remove {valid_key ?
</s> add {valid_key ? ( </s> remove <label className="form__label form__label--bold" htmlFor="certificate_chain">
</s> add <label
className="form__label form__label--bold"
htmlFor="certificate_chain"
> </s> remove : <Trans>encryption_chain_invalid</Trans>
}
</s> add ) : (
<Trans>encryption_chain_invalid</Trans>
)} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Encryption/Form.js |
{valid_key ? ( | <mask> <Trans>encryption_status</Trans>:
<mask> </div>
<mask> <ul className="encryption__list">
<mask> <li className={valid_key ? 'text-success' : 'text-danger'}>
<mask> {valid_key ?
<mask> <Trans values={{ type: key_type }}>
<mask> encryption_key_valid
<mask> </Trans>
<mask> : <Trans values={{ type: key_type }}>
<mask> encryption_key_invalid
</s> + client: split settings page into several pages </s> remove : <Trans values={{ type: key_type }}>
</s> add ) : (
<Trans values={{ type: key_type }}> </s> remove }
</s> add )} </s> remove <li className={valid_chain ? 'text-success' : 'text-danger'}>
{valid_chain ?
</s> add <li
className={valid_chain ? 'text-success' : 'text-danger'}
>
{valid_chain ? ( </s> remove : <Trans>encryption_chain_invalid</Trans>
}
</s> add ) : (
<Trans>encryption_chain_invalid</Trans>
)} </s> remove components={[<a href="https://letsencrypt.org/" key="0">link</a>]}
</s> add components={[
<a href="https://letsencrypt.org/" key="0">
link
</a>,
]} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Encryption/Form.js |
) : (
<Trans values={{ type: key_type }}> | <mask> {valid_key ?
<mask> <Trans values={{ type: key_type }}>
<mask> encryption_key_valid
<mask> </Trans>
<mask> : <Trans values={{ type: key_type }}>
<mask> encryption_key_invalid
<mask> </Trans>
<mask> }
<mask> </li>
<mask> </ul>
</s> + client: split settings page into several pages </s> remove {valid_key ?
</s> add {valid_key ? ( </s> remove }
</s> add )} </s> remove components={[<a href="https://letsencrypt.org/" key="0">link</a>]}
</s> add components={[
<a href="https://letsencrypt.org/" key="0">
link
</a>,
]} </s> remove components={[
<strong key="0">example</strong>,
]}
</s> add components={[<strong key="0">example</strong>]} </s> remove <li className={valid_chain ? 'text-success' : 'text-danger'}>
{valid_chain ?
</s> add <li
className={valid_chain ? 'text-success' : 'text-danger'}
>
{valid_chain ? ( | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Encryption/Form.js |
)} | <mask> </Trans>
<mask> : <Trans values={{ type: key_type }}>
<mask> encryption_key_invalid
<mask> </Trans>
<mask> }
<mask> </li>
<mask> </ul>
<mask> </Fragment>
<mask> }
<mask> </div>
</s> + client: split settings page into several pages </s> remove : <Trans values={{ type: key_type }}>
</s> add ) : (
<Trans values={{ type: key_type }}> </s> remove {valid_key ?
</s> add {valid_key ? ( </s> remove components={[<a href="https://letsencrypt.org/" key="0">link</a>]}
</s> add components={[
<a href="https://letsencrypt.org/" key="0">
link
</a>,
]} </s> remove }
</s> add )} </s> remove <hr className="mt-4 mb-4"/>
</s> add <hr className="mt-4 mb-4" /> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Encryption/Form.js |
)} | <mask> }
<mask> </li>
<mask> </ul>
<mask> </Fragment>
<mask> }
<mask> </div>
<mask> </div>
<mask> </div>
<mask> {warning_validation &&
<mask> <div className="col-12">
</s> + client: split settings page into several pages </s> remove {warning_validation &&
</s> add {warning_validation && ( </s> remove }
</s> add )} </s> remove <p className="text-danger">
{warning_validation}
</p>
</s> add <p className="text-danger">{warning_validation}</p> </s> remove }
</s> add )} </s> remove }
</s> add )} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Encryption/Form.js |
{warning_validation && ( | <mask> }
<mask> </div>
<mask> </div>
<mask> </div>
<mask> {warning_validation &&
<mask> <div className="col-12">
<mask> <p className="text-danger">
<mask> {warning_validation}
<mask> </p>
<mask> </div>
</s> + client: split settings page into several pages </s> remove <p className="text-danger">
{warning_validation}
</p>
</s> add <p className="text-danger">{warning_validation}</p> </s> remove }
</s> add )} </s> remove }
</s> add )} </s> remove <Card title={ t('dhcp_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<Leases leases={dhcp.leases} />
</div>
</div>
</Card>
<Card title={ t('dhcp_static_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col-12">
<StaticLeases
staticLeases={dhcp.staticLeases}
isModalOpen={dhcp.isModalOpen}
addStaticLease={this.props.addStaticLease}
removeStaticLease={this.props.removeStaticLease}
toggleLeaseModal={this.props.toggleLeaseModal}
processingAdding={dhcp.processingAdding}
processingDeleting={dhcp.processingDeleting}
</s> add <Card
title={t('dhcp_title')}
subtitle={t('dhcp_description')}
bodyType="card-body box-body--settings"
>
<div className="dhcp">
<Fragment>
<Form
onSubmit={this.handleFormSubmit}
initialValues={{
interface_name,
...values,
}}
interfaces={dhcp.interfaces}
processingConfig={dhcp.processingConfig}
processingInterfaces={dhcp.processingInterfaces}
enabled={enabled} </s> remove <hr/>
</s> add <hr /> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Encryption/Form.js |
<p className="text-danger">{warning_validation}</p> | <mask> </div>
<mask> </div>
<mask> {warning_validation &&
<mask> <div className="col-12">
<mask> <p className="text-danger">
<mask> {warning_validation}
<mask> </p>
<mask> </div>
<mask> }
<mask> </div>
<mask>
<mask> <div className="btn-list mt-2">
</s> + client: split settings page into several pages </s> remove }
</s> add )} </s> remove {warning_validation &&
</s> add {warning_validation && ( </s> remove }
</s> add )} </s> remove <Card title={ t('dhcp_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<Leases leases={dhcp.leases} />
</div>
</div>
</Card>
<Card title={ t('dhcp_static_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col-12">
<StaticLeases
staticLeases={dhcp.staticLeases}
isModalOpen={dhcp.isModalOpen}
addStaticLease={this.props.addStaticLease}
removeStaticLease={this.props.removeStaticLease}
toggleLeaseModal={this.props.toggleLeaseModal}
processingAdding={dhcp.processingAdding}
processingDeleting={dhcp.processingDeleting}
</s> add <Card
title={t('dhcp_title')}
subtitle={t('dhcp_description')}
bodyType="card-body box-body--settings"
>
<div className="dhcp">
<Fragment>
<Form
onSubmit={this.handleFormSubmit}
initialValues={{
interface_name,
...values,
}}
interfaces={dhcp.interfaces}
processingConfig={dhcp.processingConfig}
processingInterfaces={dhcp.processingInterfaces}
enabled={enabled} </s> remove <hr/>
</s> add <hr /> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Encryption/Form.js |
)} | <mask> <p className="text-danger">
<mask> {warning_validation}
<mask> </p>
<mask> </div>
<mask> }
<mask> </div>
<mask>
<mask> <div className="btn-list mt-2">
<mask> <button
<mask> type="submit"
</s> + client: split settings page into several pages </s> remove <p className="text-danger">
{warning_validation}
</p>
</s> add <p className="text-danger">{warning_validation}</p> </s> remove {warning_validation &&
</s> add {warning_validation && ( </s> remove </div>
<div className="col-12">
<button
type="button"
className="btn btn-success btn-standard mt-3"
onClick={() => this.props.toggleLeaseModal()}
>
<Trans>dhcp_add_static_lease</Trans>
</button>
</div>
</s> add <hr />
<div className="card-actions mb-3">
{this.getToggleDhcpButton()}
<button
type="button"
className={statusButtonClass}
onClick={() =>
this.props.findActiveDhcp(interface_name)
}
disabled={
enabled || !interface_name || dhcp.processingConfig
}
>
<Trans>check_dhcp_servers</Trans>
</button>
</div>
{!enabled && dhcp.check && (
<Fragment>
{this.getStaticIpWarning(t, dhcp.check, interface_name)}
{this.getActiveDhcpMessage(t, dhcp.check)}
{this.getDhcpWarning(dhcp.check)}
</Fragment>
)}
</Fragment> </s> remove }
</s> add }; </s> remove <Card title={ t('dhcp_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<Leases leases={dhcp.leases} />
</div>
</div>
</Card>
<Card title={ t('dhcp_static_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col-12">
<StaticLeases
staticLeases={dhcp.staticLeases}
isModalOpen={dhcp.isModalOpen}
addStaticLease={this.props.addStaticLease}
removeStaticLease={this.props.removeStaticLease}
toggleLeaseModal={this.props.toggleLeaseModal}
processingAdding={dhcp.processingAdding}
processingDeleting={dhcp.processingDeleting}
</s> add <Card
title={t('dhcp_title')}
subtitle={t('dhcp_description')}
bodyType="card-body box-body--settings"
>
<div className="dhcp">
<Fragment>
<Form
onSubmit={this.handleFormSubmit}
initialValues={{
interface_name,
...values,
}}
interfaces={dhcp.interfaces}
processingConfig={dhcp.processingConfig}
processingInterfaces={dhcp.processingInterfaces}
enabled={enabled} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Encryption/Form.js |
import PageTitle from '../../ui/PageTitle';
import Loading from '../../ui/Loading'; | <mask> import { DEBOUNCE_TIMEOUT } from '../../../helpers/constants';
<mask> import Form from './Form';
<mask> import Card from '../../ui/Card';
<mask>
<mask> class Encryption extends Component {
<mask> componentDidMount() {
<mask> const { getTlsStatus, validateTlsConfig, encryption } = this.props;
<mask>
</s> + client: split settings page into several pages </s> remove if (this.props.encryption.enabled) {
this.props.validateTlsConfig(this.props.encryption);
</s> add const { getTlsStatus, validateTlsConfig, encryption } = this.props;
getTlsStatus();
if (encryption.enabled) {
validateTlsConfig(encryption); </s> remove import { MODAL_TYPE, CLIENT_ID } from '../../../helpers/constants';
import Card from '../../ui/Card';
import Modal from './Modal';
</s> add import ClientsTable from './ClientsTable';
import AutoClients from './AutoClients';
import PageTitle from '../../ui/PageTitle';
import Loading from '../../ui/Loading'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
import ReactTable from 'react-table';
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Encryption/index.js |
const { getTlsStatus, validateTlsConfig, encryption } = this.props;
getTlsStatus();
if (encryption.enabled) {
validateTlsConfig(encryption); | <mask> import Card from '../../ui/Card';
<mask>
<mask> class Encryption extends Component {
<mask> componentDidMount() {
<mask> if (this.props.encryption.enabled) {
<mask> this.props.validateTlsConfig(this.props.encryption);
<mask> }
<mask> }
<mask>
<mask> handleFormSubmit = (values) => {
<mask> this.props.setTlsConfig(values);
</s> + client: split settings page into several pages </s> remove import { MODAL_TYPE, CLIENT_ID } from '../../../helpers/constants';
import Card from '../../ui/Card';
import Modal from './Modal';
</s> add import ClientsTable from './ClientsTable';
import AutoClients from './AutoClients';
import PageTitle from '../../ui/PageTitle';
import Loading from '../../ui/Loading'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Encryption/index.js |
<PageTitle title={t('encryption_settings')} />
{encryption.processing && <Loading />}
{!encryption.processing && ( | <mask> } = encryption;
<mask>
<mask> return (
<mask> <div className="encryption">
<mask> {encryption &&
<mask> <Card
<mask> title={t('encryption_title')}
<mask> subtitle={t('encryption_desc')}
<mask> bodyType="card-body box-body--settings"
<mask> >
</s> + client: split settings page into several pages </s> remove <Card
title={t('general_settings')}
bodyType="card-body box-body--settings"
>
</s> add <Card bodyType="card-body box-body--settings"> </s> remove <Card title={ t('dhcp_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<Leases leases={dhcp.leases} />
</div>
</div>
</Card>
<Card title={ t('dhcp_static_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col-12">
<StaticLeases
staticLeases={dhcp.staticLeases}
isModalOpen={dhcp.isModalOpen}
addStaticLease={this.props.addStaticLease}
removeStaticLease={this.props.removeStaticLease}
toggleLeaseModal={this.props.toggleLeaseModal}
processingAdding={dhcp.processingAdding}
processingDeleting={dhcp.processingDeleting}
</s> add <Card
title={t('dhcp_title')}
subtitle={t('dhcp_description')}
bodyType="card-body box-body--settings"
>
<div className="dhcp">
<Fragment>
<Form
onSubmit={this.handleFormSubmit}
initialValues={{
interface_name,
...values,
}}
interfaces={dhcp.interfaces}
processingConfig={dhcp.processingConfig}
processingInterfaces={dhcp.processingInterfaces}
enabled={enabled} </s> remove <Card title={ t('dhcp_title') } subtitle={ t('dhcp_description') } bodyType="card-body box-body--settings">
<div className="dhcp">
{!dhcp.processing &&
<Fragment>
<Form
onSubmit={this.handleFormSubmit}
initialValues={{
interface_name,
...values,
}}
interfaces={dhcp.interfaces}
processingConfig={dhcp.processingConfig}
processingInterfaces={dhcp.processingInterfaces}
enabled={enabled}
/>
<hr/>
<div className="card-actions mb-3">
{this.getToggleDhcpButton()}
<button
type="button"
className={statusButtonClass}
onClick={() =>
this.props.findActiveDhcp(interface_name)
}
disabled={
enabled
|| !interface_name
|| dhcp.processingConfig
}
>
<Trans>check_dhcp_servers</Trans>
</button>
</div>
{!enabled && dhcp.check &&
<Fragment>
{this.getStaticIpWarning(t, dhcp.check, interface_name)}
{this.getActiveDhcpMessage(t, dhcp.check)}
{this.getDhcpWarning(dhcp.check)}
</Fragment>
}
</Fragment>
}
</div>
</Card>
{!dhcp.processing && dhcp.config.enabled &&
</s> add <PageTitle title={t('dhcp_settings')} />
{(dhcp.processing || dhcp.processingInterfaces) && <Loading />}
{!dhcp.processing && !dhcp.processingInterfaces && ( </s> remove const {
enabled,
interface_name,
...values
} = dhcp.config;
</s> add const { enabled, interface_name, ...values } = dhcp.config; </s> remove <Card
title={t('clients_title')}
subtitle={t('clients_desc')}
bodyType="card-body box-body--settings"
>
<Fragment>
<ReactTable
data={clients || []}
columns={this.columns}
className="-striped -highlight card-table-overflow"
showPagination={true}
defaultPageSize={10}
minRows={5}
previousText={t('previous_btn')}
nextText={t('next_btn')}
loadingText={t('loading_table_status')}
pageText={t('page_table_footer_text')}
ofText={t('of_table_footer_text')}
rowsText={t('rows_table_footer_text')}
noDataText={t('clients_not_found')}
/>
<button
type="button"
className="btn btn-success btn-standard mt-3"
onClick={() => toggleClientModal(MODAL_TYPE.ADD)}
disabled={processingAdding}
>
<Trans>client_add</Trans>
</button>
<Modal
isModalOpen={isModalOpen}
modalType={modalType}
toggleClientModal={toggleClientModal}
currentClientData={currentClientData}
handleSubmit={this.handleSubmit}
processingAdding={processingAdding}
processingUpdating={processingUpdating}
/>
</Fragment>
</Card>
</s> add <Fragment>
<PageTitle title={t('clients_settings')} />
{!dashboard.processingTopStats || (!dashboard.processingClients && <Loading />)}
{!dashboard.processingTopStats && !dashboard.processingClients && (
<Fragment>
<ClientsTable
clients={dashboard.clients}
topStats={dashboard.topStats}
isModalOpen={clients.isModalOpen}
modalClientName={clients.modalClientName}
modalType={clients.modalType}
addClient={this.props.addClient}
updateClient={this.props.updateClient}
deleteClient={this.props.deleteClient}
toggleClientModal={this.props.toggleClientModal}
processingAdding={clients.processingAdding}
processingDeleting={clients.processingDeleting}
processingUpdating={clients.processingUpdating}
/>
<AutoClients
autoClients={dashboard.autoClients}
topStats={dashboard.topStats}
/>
</Fragment>
)}
</Fragment> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Encryption/index.js |
)} | <mask> setTlsConfig={this.props.setTlsConfig}
<mask> {...this.props.encryption}
<mask> />
<mask> </Card>
<mask> }
<mask> </div>
<mask> );
<mask> }
<mask> }
<mask>
</s> + client: split settings page into several pages </s> remove }
</s> add )} </s> remove <hr className="mt-4 mb-4"/>
</s> add <hr className="mt-4 mb-4" /> </s> remove }
</s> add }; </s> remove <hr className="mt-4 mb-4"/>
</s> add <hr className="mt-4 mb-4" /> </s> remove <Card title={ t('dhcp_title') } subtitle={ t('dhcp_description') } bodyType="card-body box-body--settings">
<div className="dhcp">
{!dhcp.processing &&
<Fragment>
<Form
onSubmit={this.handleFormSubmit}
initialValues={{
interface_name,
...values,
}}
interfaces={dhcp.interfaces}
processingConfig={dhcp.processingConfig}
processingInterfaces={dhcp.processingInterfaces}
enabled={enabled}
/>
<hr/>
<div className="card-actions mb-3">
{this.getToggleDhcpButton()}
<button
type="button"
className={statusButtonClass}
onClick={() =>
this.props.findActiveDhcp(interface_name)
}
disabled={
enabled
|| !interface_name
|| dhcp.processingConfig
}
>
<Trans>check_dhcp_servers</Trans>
</button>
</div>
{!enabled && dhcp.check &&
<Fragment>
{this.getStaticIpWarning(t, dhcp.check, interface_name)}
{this.getActiveDhcpMessage(t, dhcp.check)}
{this.getDhcpWarning(dhcp.check)}
</Fragment>
}
</Fragment>
}
</div>
</Card>
{!dhcp.processing && dhcp.config.enabled &&
</s> add <PageTitle title={t('dhcp_settings')} />
{(dhcp.processing || dhcp.processingInterfaces) && <Loading />}
{!dhcp.processing && !dhcp.processingInterfaces && ( | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/Encryption/index.js |
<mask> import React, { Component, Fragment } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { withNamespaces, Trans } from 'react-i18next';
<mask>
<mask> import Upstream from './Upstream';
<mask> import Dhcp from './Dhcp';
<mask> import Encryption from './Encryption';
<mask> import Clients from './Clients';
<mask> import AutoClients from './Clients/AutoClients';
<mask> import Access from './Access';
<mask> import Checkbox from '../ui/Checkbox';
<mask> import Loading from '../ui/Loading';
<mask> import PageTitle from '../ui/PageTitle';
<mask> import Card from '../ui/Card';
<mask>
</s> + client: split settings page into several pages </s> remove import { Trans, withNamespaces } from 'react-i18next';
import ReactTable from 'react-table';
</s> add </s> remove import { MODAL_TYPE, CLIENT_ID } from '../../../helpers/constants';
import Card from '../../ui/Card';
import Modal from './Modal';
</s> add import ClientsTable from './ClientsTable';
import AutoClients from './AutoClients';
import PageTitle from '../../ui/PageTitle';
import Loading from '../../ui/Loading'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/index.js | |
<mask> };
<mask>
<mask> componentDidMount() {
<mask> this.props.initSettings(this.settings);
<mask> this.props.getDhcpStatus();
<mask> this.props.getDhcpInterfaces();
<mask> this.props.getTlsStatus();
<mask> this.props.getAccessList();
<mask> }
<mask>
<mask> renderSettings = (settings) => {
<mask> if (Object.keys(settings).length > 0) {
<mask> return Object.keys(settings).map((key) => {
</s> + client: split settings page into several pages </s> remove }
</s> add }; </s> remove }
</s> add }; </s> remove }
</s> add }; </s> remove if (this.props.encryption.enabled) {
this.props.validateTlsConfig(this.props.encryption);
</s> add const { getTlsStatus, validateTlsConfig, encryption } = this.props;
getTlsStatus();
if (encryption.enabled) {
validateTlsConfig(encryption); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/index.js | |
const { settings, t } = this.props; | <mask> );
<mask> };
<mask>
<mask> render() {
<mask> const {
<mask> settings, dashboard, clients, access, t,
<mask> } = this.props;
<mask> return (
<mask> <Fragment>
<mask> <PageTitle title={t('settings')} />
<mask> {settings.processing && <Loading />}
<mask> {!settings.processing && (
</s> + client: split settings page into several pages </s> remove <PageTitle title={t('settings')} />
</s> add <PageTitle title={t('general_settings')} /> </s> remove const {
t,
clients,
isModalOpen,
modalType,
modalClientName,
toggleClientModal,
processingAdding,
processingUpdating,
} = this.props;
const currentClientData = this.getClient(modalClientName, clients);
</s> add const { dashboard, clients, t } = this.props; </s> remove }
</s> add }; </s> remove }
</s> add }; </s> remove !dashboard.processingVersions &&
dashboard.isCoreRunning &&
dashboard.isUpdateAvailable;
</s> add !dashboard.processingVersions && dashboard.isCoreRunning && dashboard.isUpdateAvailable; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/index.js |
<PageTitle title={t('general_settings')} /> | <mask> settings, dashboard, clients, access, t,
<mask> } = this.props;
<mask> return (
<mask> <Fragment>
<mask> <PageTitle title={t('settings')} />
<mask> {settings.processing && <Loading />}
<mask> {!settings.processing && (
<mask> <div className="content">
<mask> <div className="row">
<mask> <div className="col-md-12">
</s> + client: split settings page into several pages </s> remove const {
settings, dashboard, clients, access, t,
} = this.props;
</s> add const { settings, t } = this.props; </s> remove <Card
title={t('general_settings')}
bodyType="card-body box-body--settings"
>
</s> add <Card bodyType="card-body box-body--settings"> </s> remove {encryption &&
</s> add <PageTitle title={t('encryption_settings')} />
{encryption.processing && <Loading />}
{!encryption.processing && ( </s> remove const {
t,
clients,
isModalOpen,
modalType,
modalClientName,
toggleClientModal,
processingAdding,
processingUpdating,
} = this.props;
const currentClientData = this.getClient(modalClientName, clients);
</s> add const { dashboard, clients, t } = this.props; </s> remove <Card title={ t('dhcp_title') } subtitle={ t('dhcp_description') } bodyType="card-body box-body--settings">
<div className="dhcp">
{!dhcp.processing &&
<Fragment>
<Form
onSubmit={this.handleFormSubmit}
initialValues={{
interface_name,
...values,
}}
interfaces={dhcp.interfaces}
processingConfig={dhcp.processingConfig}
processingInterfaces={dhcp.processingInterfaces}
enabled={enabled}
/>
<hr/>
<div className="card-actions mb-3">
{this.getToggleDhcpButton()}
<button
type="button"
className={statusButtonClass}
onClick={() =>
this.props.findActiveDhcp(interface_name)
}
disabled={
enabled
|| !interface_name
|| dhcp.processingConfig
}
>
<Trans>check_dhcp_servers</Trans>
</button>
</div>
{!enabled && dhcp.check &&
<Fragment>
{this.getStaticIpWarning(t, dhcp.check, interface_name)}
{this.getActiveDhcpMessage(t, dhcp.check)}
{this.getDhcpWarning(dhcp.check)}
</Fragment>
}
</Fragment>
}
</div>
</Card>
{!dhcp.processing && dhcp.config.enabled &&
</s> add <PageTitle title={t('dhcp_settings')} />
{(dhcp.processing || dhcp.processingInterfaces) && <Loading />}
{!dhcp.processing && !dhcp.processingInterfaces && ( | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/index.js |
<Card bodyType="card-body box-body--settings"> | <mask> {!settings.processing && (
<mask> <div className="content">
<mask> <div className="row">
<mask> <div className="col-md-12">
<mask> <Card
<mask> title={t('general_settings')}
<mask> bodyType="card-body box-body--settings"
<mask> >
<mask> <div className="form">
<mask> {this.renderSettings(settings.settingsList)}
<mask> </div>
<mask> </Card>
<mask> <Upstream
</s> + client: split settings page into several pages </s> remove <PageTitle title={t('settings')} />
</s> add <PageTitle title={t('general_settings')} /> </s> remove <Card title={ t('dhcp_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<Leases leases={dhcp.leases} />
</div>
</div>
</Card>
<Card title={ t('dhcp_static_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col-12">
<StaticLeases
staticLeases={dhcp.staticLeases}
isModalOpen={dhcp.isModalOpen}
addStaticLease={this.props.addStaticLease}
removeStaticLease={this.props.removeStaticLease}
toggleLeaseModal={this.props.toggleLeaseModal}
processingAdding={dhcp.processingAdding}
processingDeleting={dhcp.processingDeleting}
</s> add <Card
title={t('dhcp_title')}
subtitle={t('dhcp_description')}
bodyType="card-body box-body--settings"
>
<div className="dhcp">
<Fragment>
<Form
onSubmit={this.handleFormSubmit}
initialValues={{
interface_name,
...values,
}}
interfaces={dhcp.interfaces}
processingConfig={dhcp.processingConfig}
processingInterfaces={dhcp.processingInterfaces}
enabled={enabled} </s> remove {encryption &&
</s> add <PageTitle title={t('encryption_settings')} />
{encryption.processing && <Loading />}
{!encryption.processing && ( </s> remove <Upstream
upstreamDns={dashboard.upstreamDns}
bootstrapDns={dashboard.bootstrapDns}
allServers={dashboard.allServers}
setUpstream={this.props.setUpstream}
testUpstream={this.props.testUpstream}
processingTestUpstream={settings.processingTestUpstream}
processingSetUpstream={settings.processingSetUpstream}
/>
{!dashboard.processingTopStats && !dashboard.processingClients && (
<Fragment>
<Clients
clients={dashboard.clients}
topStats={dashboard.topStats}
isModalOpen={clients.isModalOpen}
modalClientName={clients.modalClientName}
modalType={clients.modalType}
addClient={this.props.addClient}
updateClient={this.props.updateClient}
deleteClient={this.props.deleteClient}
toggleClientModal={this.props.toggleClientModal}
processingAdding={clients.processingAdding}
processingDeleting={clients.processingDeleting}
processingUpdating={clients.processingUpdating}
/>
<AutoClients
autoClients={dashboard.autoClients}
topStats={dashboard.topStats}
/>
</Fragment>
)}
<Access access={access} setAccessList={this.props.setAccessList} />
<Encryption
encryption={this.props.encryption}
setTlsConfig={this.props.setTlsConfig}
validateTlsConfig={this.props.validateTlsConfig}
/>
<Dhcp
dhcp={this.props.dhcp}
toggleDhcp={this.props.toggleDhcp}
getDhcpStatus={this.props.getDhcpStatus}
findActiveDhcp={this.props.findActiveDhcp}
setDhcpConfig={this.props.setDhcpConfig}
addStaticLease={this.props.addStaticLease}
removeStaticLease={this.props.removeStaticLease}
toggleLeaseModal={this.props.toggleLeaseModal}
/>
</s> add </s> remove <Card title={ t('dhcp_title') } subtitle={ t('dhcp_description') } bodyType="card-body box-body--settings">
<div className="dhcp">
{!dhcp.processing &&
<Fragment>
<Form
onSubmit={this.handleFormSubmit}
initialValues={{
interface_name,
...values,
}}
interfaces={dhcp.interfaces}
processingConfig={dhcp.processingConfig}
processingInterfaces={dhcp.processingInterfaces}
enabled={enabled}
/>
<hr/>
<div className="card-actions mb-3">
{this.getToggleDhcpButton()}
<button
type="button"
className={statusButtonClass}
onClick={() =>
this.props.findActiveDhcp(interface_name)
}
disabled={
enabled
|| !interface_name
|| dhcp.processingConfig
}
>
<Trans>check_dhcp_servers</Trans>
</button>
</div>
{!enabled && dhcp.check &&
<Fragment>
{this.getStaticIpWarning(t, dhcp.check, interface_name)}
{this.getActiveDhcpMessage(t, dhcp.check)}
{this.getDhcpWarning(dhcp.check)}
</Fragment>
}
</Fragment>
}
</div>
</Card>
{!dhcp.processing && dhcp.config.enabled &&
</s> add <PageTitle title={t('dhcp_settings')} />
{(dhcp.processing || dhcp.processingInterfaces) && <Loading />}
{!dhcp.processing && !dhcp.processingInterfaces && ( | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/index.js |
<mask> <div className="form">
<mask> {this.renderSettings(settings.settingsList)}
<mask> </div>
<mask> </Card>
<mask> <Upstream
<mask> upstreamDns={dashboard.upstreamDns}
<mask> bootstrapDns={dashboard.bootstrapDns}
<mask> allServers={dashboard.allServers}
<mask> setUpstream={this.props.setUpstream}
<mask> testUpstream={this.props.testUpstream}
<mask> processingTestUpstream={settings.processingTestUpstream}
<mask> processingSetUpstream={settings.processingSetUpstream}
<mask> />
<mask> {!dashboard.processingTopStats && !dashboard.processingClients && (
<mask> <Fragment>
<mask> <Clients
<mask> clients={dashboard.clients}
<mask> topStats={dashboard.topStats}
<mask> isModalOpen={clients.isModalOpen}
<mask> modalClientName={clients.modalClientName}
<mask> modalType={clients.modalType}
<mask> addClient={this.props.addClient}
<mask> updateClient={this.props.updateClient}
<mask> deleteClient={this.props.deleteClient}
<mask> toggleClientModal={this.props.toggleClientModal}
<mask> processingAdding={clients.processingAdding}
<mask> processingDeleting={clients.processingDeleting}
<mask> processingUpdating={clients.processingUpdating}
<mask> />
<mask> <AutoClients
<mask> autoClients={dashboard.autoClients}
<mask> topStats={dashboard.topStats}
<mask> />
<mask> </Fragment>
<mask> )}
<mask> <Access access={access} setAccessList={this.props.setAccessList} />
<mask> <Encryption
<mask> encryption={this.props.encryption}
<mask> setTlsConfig={this.props.setTlsConfig}
<mask> validateTlsConfig={this.props.validateTlsConfig}
<mask> />
<mask> <Dhcp
<mask> dhcp={this.props.dhcp}
<mask> toggleDhcp={this.props.toggleDhcp}
<mask> getDhcpStatus={this.props.getDhcpStatus}
<mask> findActiveDhcp={this.props.findActiveDhcp}
<mask> setDhcpConfig={this.props.setDhcpConfig}
<mask> addStaticLease={this.props.addStaticLease}
<mask> removeStaticLease={this.props.removeStaticLease}
<mask> toggleLeaseModal={this.props.toggleLeaseModal}
<mask> />
<mask> </div>
<mask> </div>
<mask> </div>
<mask> )}
<mask> </Fragment>
</s> + client: split settings page into several pages </s> remove <Card
title={t('clients_title')}
subtitle={t('clients_desc')}
bodyType="card-body box-body--settings"
>
<Fragment>
<ReactTable
data={clients || []}
columns={this.columns}
className="-striped -highlight card-table-overflow"
showPagination={true}
defaultPageSize={10}
minRows={5}
previousText={t('previous_btn')}
nextText={t('next_btn')}
loadingText={t('loading_table_status')}
pageText={t('page_table_footer_text')}
ofText={t('of_table_footer_text')}
rowsText={t('rows_table_footer_text')}
noDataText={t('clients_not_found')}
/>
<button
type="button"
className="btn btn-success btn-standard mt-3"
onClick={() => toggleClientModal(MODAL_TYPE.ADD)}
disabled={processingAdding}
>
<Trans>client_add</Trans>
</button>
<Modal
isModalOpen={isModalOpen}
modalType={modalType}
toggleClientModal={toggleClientModal}
currentClientData={currentClientData}
handleSubmit={this.handleSubmit}
processingAdding={processingAdding}
processingUpdating={processingUpdating}
/>
</Fragment>
</Card>
</s> add <Fragment>
<PageTitle title={t('clients_settings')} />
{!dashboard.processingTopStats || (!dashboard.processingClients && <Loading />)}
{!dashboard.processingTopStats && !dashboard.processingClients && (
<Fragment>
<ClientsTable
clients={dashboard.clients}
topStats={dashboard.topStats}
isModalOpen={clients.isModalOpen}
modalClientName={clients.modalClientName}
modalType={clients.modalType}
addClient={this.props.addClient}
updateClient={this.props.updateClient}
deleteClient={this.props.deleteClient}
toggleClientModal={this.props.toggleClientModal}
processingAdding={clients.processingAdding}
processingDeleting={clients.processingDeleting}
processingUpdating={clients.processingUpdating}
/>
<AutoClients
autoClients={dashboard.autoClients}
topStats={dashboard.topStats}
/>
</Fragment>
)}
</Fragment> </s> remove }
</s> add )} </s> remove <Card title={ t('dhcp_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<Leases leases={dhcp.leases} />
</div>
</div>
</Card>
<Card title={ t('dhcp_static_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col-12">
<StaticLeases
staticLeases={dhcp.staticLeases}
isModalOpen={dhcp.isModalOpen}
addStaticLease={this.props.addStaticLease}
removeStaticLease={this.props.removeStaticLease}
toggleLeaseModal={this.props.toggleLeaseModal}
processingAdding={dhcp.processingAdding}
processingDeleting={dhcp.processingDeleting}
</s> add <Card
title={t('dhcp_title')}
subtitle={t('dhcp_description')}
bodyType="card-body box-body--settings"
>
<div className="dhcp">
<Fragment>
<Form
onSubmit={this.handleFormSubmit}
initialValues={{
interface_name,
...values,
}}
interfaces={dhcp.interfaces}
processingConfig={dhcp.processingConfig}
processingInterfaces={dhcp.processingInterfaces}
enabled={enabled} </s> remove </div>
<div className="col-12">
<button
type="button"
className="btn btn-success btn-standard mt-3"
onClick={() => this.props.toggleLeaseModal()}
>
<Trans>dhcp_add_static_lease</Trans>
</button>
</div>
</s> add <hr />
<div className="card-actions mb-3">
{this.getToggleDhcpButton()}
<button
type="button"
className={statusButtonClass}
onClick={() =>
this.props.findActiveDhcp(interface_name)
}
disabled={
enabled || !interface_name || dhcp.processingConfig
}
>
<Trans>check_dhcp_servers</Trans>
</button>
</div>
{!enabled && dhcp.check && (
<Fragment>
{this.getStaticIpWarning(t, dhcp.check, interface_name)}
{this.getActiveDhcpMessage(t, dhcp.check)}
{this.getDhcpWarning(dhcp.check)}
</Fragment>
)}
</Fragment> </s> remove <Card
title={t('general_settings')}
bodyType="card-body box-body--settings"
>
</s> add <Card bodyType="card-body box-body--settings"> | [
"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/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/index.js | |
<mask> initSettings: PropTypes.func,
<mask> settings: PropTypes.object,
<mask> settingsList: PropTypes.object,
<mask> toggleSetting: PropTypes.func,
<mask> handleUpstreamChange: PropTypes.func,
<mask> setUpstream: PropTypes.func,
<mask> t: PropTypes.func,
<mask> };
<mask>
<mask> export default withNamespaces()(Settings);
</s> + client: split settings page into several pages </s> remove handleSubmit: PropTypes.func,
</s> add </s> remove }
</s> add }; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/cf53653cfaf581bf6e66aa72cb340309c23195db | client/src/components/Settings/index.js | |
<mask> "sync"
<mask> "sync/atomic"
<mask> "time"
<mask>
<mask> "github.com/bluele/gcache"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "golang.org/x/net/publicsuffix"
<mask> )
<mask>
<mask> const defaultCacheSize = 64 * 1024 // in number of elements
</s> Fix #598 - [change] service: windows: register sercive to work under local system user </s> remove
// Windows
if runtime.GOOS == "windows" {
c.UserName = "NT AUTHORITY\\NetworkService"
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d06cc0f8ee89a0142c493b33d295272ba100aaf5 | dnsfilter/dnsfilter.go | |
"github.com/bluele/gcache" | <mask> "sync/atomic"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "golang.org/x/net/publicsuffix"
<mask> )
<mask>
<mask> const defaultCacheSize = 64 * 1024 // in number of elements
<mask> const defaultCacheTime = 30 * time.Minute
</s> Fix #598 - [change] service: windows: register sercive to work under local system user </s> remove "github.com/bluele/gcache"
</s> add </s> remove
// Windows
if runtime.GOOS == "windows" {
c.UserName = "NT AUTHORITY\\NetworkService"
}
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d06cc0f8ee89a0142c493b33d295272ba100aaf5 | dnsfilter/dnsfilter.go |
<mask>
<mask> // POSIX
<mask> // Redirect StdErr & StdOut to files.
<mask> c.Option["LogOutput"] = true
<mask>
<mask> // Windows
<mask> if runtime.GOOS == "windows" {
<mask> c.UserName = "NT AUTHORITY\\NetworkService"
<mask> }
<mask> }
<mask>
<mask> // cleanupService called on the service uninstall, cleans up additional files if needed
<mask> func cleanupService() {
<mask> if runtime.GOOS == "darwin" {
</s> Fix #598 - [change] service: windows: register sercive to work under local system user </s> remove "github.com/bluele/gcache"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d06cc0f8ee89a0142c493b33d295272ba100aaf5 | service.go | |
res.IP = addrs[0] | <mask> log.Tracef("SafeSearchDomain for %s was found but failed to lookup for %s cause %s", host, safeHost, err)
<mask> return Result{}, err
<mask> }
<mask>
<mask> // The next bug may occurs: LookupIP returns DNS64 mapped ipv4 address with zero-prefix
<mask> for _, i := range addrs {
<mask> if ipv4 := i.To4(); ipv4 != nil && len(i) == net.IPv6len {
<mask> res.IP = ipv4
<mask> break
</s> Add safesearch test for dnsforward </s> remove var ip net.IP
</s> add ip := ips[0] </s> remove if ip == nil || len(ip) == 0 {
ip = ips[0]
}
// Enable safesearch and check host
d.SafeSearchEnabled = true
</s> add </s> remove if res.IP == nil || len(res.IP) == 0 {
res.IP = addrs[0]
}
</s> add </s> remove func createTestMessage() *dns.Msg {
</s> add func exchangeAndAssertResponse(t *testing.T, client dns.Client, addr net.Addr, host, ip string) {
req := createTestMessage(host)
reply, _, err := client.Exchange(req, addr.String())
if err != nil {
t.Fatalf("Couldn't talk to server %s: %s", addr, err)
}
assertResponse(t, reply, ip)
}
func createGoogleATestMessage() *dns.Msg {
return createTestMessage("google-public-dns-a.google.com.")
}
func createTestMessage(host string) *dns.Msg { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0f4f22e0d328528683ad70acd25d61f292326de | dnsfilter/dnsfilter.go |
<mask> break
<mask> }
<mask> }
<mask>
<mask> if res.IP == nil || len(res.IP) == 0 {
<mask> res.IP = addrs[0]
<mask> }
<mask>
<mask> // Cache result
<mask> err = safeSearchCache.Set(host, res)
<mask> if err != nil {
<mask> return Result{}, nil
<mask> }
</s> Add safesearch test for dnsforward </s> remove if ip == nil || len(ip) == 0 {
ip = ips[0]
}
// Enable safesearch and check host
d.SafeSearchEnabled = true
</s> add </s> remove var ip net.IP
</s> add ip := ips[0] </s> remove func createTestMessage() *dns.Msg {
</s> add func exchangeAndAssertResponse(t *testing.T, client dns.Client, addr net.Addr, host, ip string) {
req := createTestMessage(host)
reply, _, err := client.Exchange(req, addr.String())
if err != nil {
t.Fatalf("Couldn't talk to server %s: %s", addr, err)
}
assertResponse(t, reply, ip)
}
func createGoogleATestMessage() *dns.Msg {
return createTestMessage("google-public-dns-a.google.com.")
}
func createTestMessage(host string) *dns.Msg { </s> remove assertResponse(t, reply)
</s> add assertGoogleAResponse(t, reply) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0f4f22e0d328528683ad70acd25d61f292326de | dnsfilter/dnsfilter.go | |
// Enable safesearch and check host
d.SafeSearchEnabled = true | <mask> t.Fatalf("SafeSearch is not enabled but there is an answer!")
<mask> }
<mask>
<mask>
<mask> // Let's lookup for safesearch domain
<mask> safeDomain, ok := d.SafeSearchDomain(domain)
<mask> if !ok {
</s> Add safesearch test for dnsforward </s> remove if ip == nil || len(ip) == 0 {
ip = ips[0]
}
// Enable safesearch and check host
d.SafeSearchEnabled = true
</s> add </s> remove var ip net.IP
</s> add ip := ips[0] </s> remove func assertResponse(t *testing.T, reply *dns.Msg) {
</s> add func assertGoogleAResponse(t *testing.T, reply *dns.Msg) {
assertResponse(t, reply, "8.8.8.8")
}
func assertResponse(t *testing.T, reply *dns.Msg, ip string) { </s> remove if !net.IPv4(8, 8, 8, 8).Equal(a.A) {
t.Fatalf("DNS server returned wrong answer instead of 8.8.8.8: %v", a.A)
</s> add if !net.ParseIP(ip).Equal(a.A) {
t.Fatalf("DNS server returned wrong answer instead of %s: %v", ip, a.A) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/d0f4f22e0d328528683ad70acd25d61f292326de | dnsfilter/dnsfilter_test.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.