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

* client: remove /clients and /stats_top request from global requests

This commit is contained in:
Ildar Kamalov 2019-07-08 12:49:03 +03:00
parent fce551dcaf
commit 2520a62e24
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -277,8 +277,6 @@ export const getDnsStatus = () => async (dispatch) => {
const dnsStatus = await apiClient.getGlobalStatus(); const dnsStatus = await apiClient.getGlobalStatus();
dispatch(dnsStatusSuccess(dnsStatus)); dispatch(dnsStatusSuccess(dnsStatus));
dispatch(getVersion()); dispatch(getVersion());
dispatch(getClients());
dispatch(getTopStats());
dispatch(getTlsStatus()); dispatch(getTlsStatus());
} catch (error) { } catch (error) {
dispatch(addErrorToast({ error })); dispatch(addErrorToast({ error }));

2
client/src/components/Logs/index.js
View File

@ -21,6 +21,7 @@ class Logs extends Component {
componentDidMount() { componentDidMount() {
this.getLogs(); this.getLogs();
this.props.getFilteringStatus(); this.props.getFilteringStatus();
this.props.getClients();
} }
componentDidUpdate(prevProps) { componentDidUpdate(prevProps) {
@ -356,6 +357,7 @@ Logs.propTypes = {
processingRules: PropTypes.bool, processingRules: PropTypes.bool,
logStatusProcessing: PropTypes.bool, logStatusProcessing: PropTypes.bool,
t: PropTypes.func, t: PropTypes.func,
getClients: PropTypes.func.isRequired,
}; };
export default withNamespaces()(Logs); export default withNamespaces()(Logs);

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

@ -10,6 +10,7 @@ import Loading from '../../ui/Loading';
class Clients extends Component { class Clients extends Component {
componentDidMount() { componentDidMount() {
this.props.getClients(); this.props.getClients();
this.props.getTopStats();
} }
render() { render() {
@ -63,6 +64,7 @@ Clients.propTypes = {
addClient: PropTypes.func.isRequired, addClient: PropTypes.func.isRequired,
updateClient: PropTypes.func.isRequired, updateClient: PropTypes.func.isRequired,
getClients: PropTypes.func.isRequired, getClients: PropTypes.func.isRequired,
getTopStats: PropTypes.func.isRequired,
topStats: PropTypes.object, topStats: PropTypes.object,
}; };

3
client/src/containers/Clients.js
View File

@ -1,5 +1,5 @@
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { getClients } from '../actions'; import { getClients, getTopStats } 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';
@ -14,6 +14,7 @@ const mapStateToProps = (state) => {
const mapDispatchToProps = { const mapDispatchToProps = {
getClients, getClients,
getTopStats,
addClient, addClient,
updateClient, updateClient,
deleteClient, deleteClient,

3
client/src/containers/Logs.js
View File

@ -1,5 +1,5 @@
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { getLogs, toggleLogStatus, downloadQueryLog, getFilteringStatus, setRules, addSuccessToast } from '../actions'; import { getLogs, toggleLogStatus, downloadQueryLog, getFilteringStatus, setRules, addSuccessToast, getClients } from '../actions';
import Logs from '../components/Logs'; import Logs from '../components/Logs';
const mapStateToProps = (state) => { const mapStateToProps = (state) => {
@ -15,6 +15,7 @@ const mapDispatchToProps = {
getFilteringStatus, getFilteringStatus,
setRules, setRules,
addSuccessToast, addSuccessToast,
getClients,
}; };
export default connect( export default connect(