a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* client: use JSON for filtering/remove_url

This commit is contained in:
Ildar Kamalov 2019-06-03 16:33:15 +03:00
parent c93cb43db8
commit 7f5ac19b59
3 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/__locales/en.json
View File

@ -297,6 +297,7 @@
"table_statistics": "Requests count (last 24 hours)", "table_statistics": "Requests count (last 24 hours)",
"clients_not_found": "No clients found", "clients_not_found": "No clients found",
"client_confirm_delete": "Are you sure you want to delete client \"{{key}}\"?", "client_confirm_delete": "Are you sure you want to delete client \"{{key}}\"?",
"filter_confirm_delete": "Are you sure you want to delete filter?",
"auto_clients_title": "Clients (runtime)", "auto_clients_title": "Clients (runtime)",
"auto_clients_desc": "Data on the clients that use AdGuard Home, but not stored in the configuration" "auto_clients_desc": "Data on the clients that use AdGuard Home, but not stored in the configuration"
} }

21
client/src/api/Api.js
View File

@ -188,15 +188,14 @@ export default class Api {
return this.makeRequest(path, method, config); return this.makeRequest(path, method, config);
} }
removeFilter(url) { removeFilter(config) {
const { path, method } = this.FILTERING_REMOVE_FILTER; const { path, method } = this.FILTERING_REMOVE_FILTER;
const parameter = 'url'; const parameters = {
const requestBody = `${parameter}=${url}`; data: config,
const config = { headers: { 'Content-Type': 'application/json' },
data: requestBody,
header: { 'Content-Type': 'text/plain' },
}; };
return this.makeRequest(path, method, config);
return this.makeRequest(path, method, parameters);
} }
setRules(rules) { setRules(rules) {
@ -424,10 +423,10 @@ export default class Api {
} }
// Per-client settings // Per-client settings
GET_CLIENTS = { path: 'clients', method: 'GET' } GET_CLIENTS = { path: 'clients', method: 'GET' };
ADD_CLIENT = { path: 'clients/add', method: 'POST' } ADD_CLIENT = { path: 'clients/add', method: 'POST' };
DELETE_CLIENT = { path: 'clients/delete', method: 'POST' } DELETE_CLIENT = { path: 'clients/delete', method: 'POST' };
UPDATE_CLIENT = { path: 'clients/update', method: 'POST' } UPDATE_CLIENT = { path: 'clients/update', method: 'POST' };
getClients() { getClients() {
const { path, method } = this.GET_CLIENTS; const { path, method } = this.GET_CLIENTS;

9
client/src/components/Filters/index.js
View File

@ -32,6 +32,13 @@ class Filters extends Component {
); );
}; };
handleDelete = (url) => {
// eslint-disable-next-line no-alert
if (window.confirm(this.props.t('filter_confirm_delete'))) {
this.props.removeFilter({ url });
}
}
columns = [{ columns = [{
Header: <Trans>enabled_table_header</Trans>, Header: <Trans>enabled_table_header</Trans>,
accessor: 'enabled', accessor: 'enabled',
@ -62,7 +69,7 @@ class Filters extends Component {
<button <button
type="button" type="button"
className="btn btn-icon btn-outline-secondary btn-sm" className="btn btn-icon btn-outline-secondary btn-sm"
onClick={() => this.props.removeFilter(value)} onClick={() => this.handleDelete(value)}
title={this.props.t('delete_table_action')} title={this.props.t('delete_table_action')}
> >
<svg className="icons"> <svg className="icons">