AdguardTeam/AdGuardHome
1
1
Fork 0
mirror of https://github.com/AdguardTeam/AdGuardHome.git synced 2024-12-15 19:31:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

* client: confirm before deleting

Browse Source
This commit is contained in:
Ildar Kamalov 2019-05-22 19:11:16 +03:00 committed by Simon Zolin
parent c7b5830336
commit f40141bbbc
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -286,5 +286,6 @@
"client_added": "Client \"{{key}}\" successfully added", "client_added": "Client \"{{key}}\" successfully added",
"client_updated": "Client \"{{key}}\" successfully updated", "client_updated": "Client \"{{key}}\" successfully updated",
"table_statistics": "Statistics (last 24 hours)", "table_statistics": "Statistics (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}}\"?"
} }

2
client/src/actions/clients.js
View File

@ -32,7 +32,6 @@ export const addClient = config => async (dispatch) => {
dispatch(addSuccessToast(t('client_added', { key: config.name }))); dispatch(addSuccessToast(t('client_added', { key: config.name })));
dispatch(getClients()); dispatch(getClients());
} catch (error) { } catch (error) {
dispatch(toggleClientModal());
dispatch(addErrorToast({ error })); dispatch(addErrorToast({ error }));
dispatch(addClientFailure()); dispatch(addClientFailure());
} }
@ -79,7 +78,6 @@ export const updateClient = (config, name) => async (dispatch) => {
dispatch(addSuccessToast(t('client_updated', { key: name }))); dispatch(addSuccessToast(t('client_updated', { key: name })));
dispatch(getClients()); dispatch(getClients());
} catch (error) { } catch (error) {
dispatch(toggleClientModal());
dispatch(addErrorToast({ error })); dispatch(addErrorToast({ error }));
dispatch(updateClientFailure()); dispatch(updateClientFailure());
} }

10
client/src/components/Settings/Clients/index.js
View File

@ -59,6 +59,13 @@ class Clients extends Component {
return ''; return '';
}; };
handleDelete = (data) => {
// eslint-disable-next-line no-alert
if (window.confirm(this.props.t('client_confirm_delete', { key: data.name }))) {
this.props.deleteClient(data);
}
}
columns = [ columns = [
{ {
Header: this.props.t('table_client'), Header: this.props.t('table_client'),
@ -136,7 +143,6 @@ class Clients extends Component {
const clientName = row.original.name; const clientName = row.original.name;
const { const {
toggleClientModal, toggleClientModal,
deleteClient,
processingDeleting, processingDeleting,
processingUpdating, processingUpdating,
} = this.props; } = this.props;
@ -159,7 +165,7 @@ class Clients extends Component {
<button <button
type="button" type="button"
className="btn btn-outline-secondary btn-sm" className="btn btn-outline-secondary btn-sm"
onClick={() => deleteClient({ name: clientName })} onClick={() => this.handleDelete({ name: clientName })}
disabled={processingDeleting} disabled={processingDeleting}
> >
<Trans>delete_table_action</Trans> <Trans>delete_table_action</Trans>

2
client/src/components/Toasts/Toast.css
View File

@ -2,7 +2,7 @@
position: fixed; position: fixed;
right: 24px; right: 24px;
bottom: 24px; bottom: 24px;
z-index: 103; z-index: 105;
width: 345px; width: 345px;
} }

2
client/src/components/ui/Modal.css
View File

@ -5,7 +5,7 @@
overflow-x: hidden; overflow-x: hidden;
overflow-y: auto; overflow-y: auto;
background-color: rgba(0, 0, 0, 0.5); background-color: rgba(0, 0, 0, 0.5);
z-index: 105; z-index: 104;
} }
.ReactModal__Overlay--after-open { .ReactModal__Overlay--after-open {