Merge pull request in DNS/adguard-dns from fix/793 to master
Closes #793 * commit 'b2364e465f7c7b19ad455b07864ddaf2848e6664': * client: reload list on opening Clients settings
This commit is contained in:
commit
86ba6d4332
|
@ -21,6 +21,7 @@ class Dashboard extends Component {
|
||||||
this.props.getStats();
|
this.props.getStats();
|
||||||
this.props.getStatsHistory();
|
this.props.getStatsHistory();
|
||||||
this.props.getTopStats();
|
this.props.getTopStats();
|
||||||
|
this.props.getClients();
|
||||||
}
|
}
|
||||||
|
|
||||||
getToggleFilteringButton = () => {
|
getToggleFilteringButton = () => {
|
||||||
|
@ -132,6 +133,7 @@ Dashboard.propTypes = {
|
||||||
isCoreRunning: PropTypes.bool,
|
isCoreRunning: PropTypes.bool,
|
||||||
getFiltering: PropTypes.func,
|
getFiltering: PropTypes.func,
|
||||||
toggleProtection: PropTypes.func,
|
toggleProtection: PropTypes.func,
|
||||||
|
getClients: PropTypes.func,
|
||||||
processingProtection: PropTypes.bool,
|
processingProtection: PropTypes.bool,
|
||||||
t: PropTypes.func,
|
t: PropTypes.func,
|
||||||
};
|
};
|
||||||
|
|
|
@ -8,6 +8,10 @@ import PageTitle from '../../ui/PageTitle';
|
||||||
import Loading from '../../ui/Loading';
|
import Loading from '../../ui/Loading';
|
||||||
|
|
||||||
class Clients extends Component {
|
class Clients extends Component {
|
||||||
|
componentDidMount() {
|
||||||
|
this.props.getClients();
|
||||||
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const {
|
const {
|
||||||
t,
|
t,
|
||||||
|
@ -58,6 +62,7 @@ Clients.propTypes = {
|
||||||
deleteClient: PropTypes.func.isRequired,
|
deleteClient: PropTypes.func.isRequired,
|
||||||
addClient: PropTypes.func.isRequired,
|
addClient: PropTypes.func.isRequired,
|
||||||
updateClient: PropTypes.func.isRequired,
|
updateClient: PropTypes.func.isRequired,
|
||||||
|
getClients: PropTypes.func.isRequired,
|
||||||
topStats: PropTypes.object,
|
topStats: PropTypes.object,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import { connect } from 'react-redux';
|
import { connect } from 'react-redux';
|
||||||
import { addErrorToast } from '../actions';
|
import { getClients } from '../actions';
|
||||||
import { addClient, updateClient, deleteClient, toggleClientModal } from '../actions/clients';
|
import { addClient, updateClient, deleteClient, toggleClientModal } from '../actions/clients';
|
||||||
import Clients from '../components/Settings/Clients';
|
import Clients from '../components/Settings/Clients';
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@ const mapStateToProps = (state) => {
|
||||||
};
|
};
|
||||||
|
|
||||||
const mapDispatchToProps = {
|
const mapDispatchToProps = {
|
||||||
addErrorToast,
|
getClients,
|
||||||
addClient,
|
addClient,
|
||||||
updateClient,
|
updateClient,
|
||||||
deleteClient,
|
deleteClient,
|
||||||
|
|
Loading…
Reference in New Issue