Add a warning when node is syncing (#5565)
* Add a warning when node is syncing * Linting * Linting * PR Grumbles
This commit is contained in:
parent
076b602343
commit
5baccafb23
@ -241,7 +241,7 @@ export default class Balances {
|
|||||||
|
|
||||||
// If syncing, only retrieve balances once every
|
// If syncing, only retrieve balances once every
|
||||||
// few seconds
|
// few seconds
|
||||||
if (syncing) {
|
if (syncing || syncing === null) {
|
||||||
this.shortThrottledFetch.cancel();
|
this.shortThrottledFetch.cancel();
|
||||||
this.longThrottledFetch(skipNotifications);
|
this.longThrottledFetch(skipNotifications);
|
||||||
|
|
||||||
|
@ -33,7 +33,7 @@ const initialState = {
|
|||||||
netVersion: '0',
|
netVersion: '0',
|
||||||
nodeKind: null,
|
nodeKind: null,
|
||||||
nodeKindFull: null,
|
nodeKindFull: null,
|
||||||
syncing: true,
|
syncing: null,
|
||||||
isConnected: false,
|
isConnected: false,
|
||||||
isConnecting: false,
|
isConnecting: false,
|
||||||
isTest: undefined,
|
isTest: undefined,
|
||||||
|
@ -22,6 +22,7 @@ import UpgradeStore from '~/modals/UpgradeParity/store';
|
|||||||
|
|
||||||
import Connection from '../Connection';
|
import Connection from '../Connection';
|
||||||
import ParityBar from '../ParityBar';
|
import ParityBar from '../ParityBar';
|
||||||
|
import SyncWarning, { showSyncWarning } from '../SyncWarning';
|
||||||
|
|
||||||
import Snackbar from './Snackbar';
|
import Snackbar from './Snackbar';
|
||||||
import Container from './Container';
|
import Container from './Container';
|
||||||
@ -36,6 +37,7 @@ import Requests from './Requests';
|
|||||||
import styles from './application.css';
|
import styles from './application.css';
|
||||||
|
|
||||||
const inFrame = window.parent !== window && window.parent.frames.length !== 0;
|
const inFrame = window.parent !== window && window.parent.frames.length !== 0;
|
||||||
|
const doShowSyncWarning = showSyncWarning();
|
||||||
|
|
||||||
@observer
|
@observer
|
||||||
class Application extends Component {
|
class Application extends Component {
|
||||||
@ -78,6 +80,11 @@ class Application extends Component {
|
|||||||
? this.renderMinimized()
|
? this.renderMinimized()
|
||||||
: this.renderApp()
|
: this.renderApp()
|
||||||
}
|
}
|
||||||
|
{
|
||||||
|
doShowSyncWarning
|
||||||
|
? (<SyncWarning />)
|
||||||
|
: null
|
||||||
|
}
|
||||||
<Connection />
|
<Connection />
|
||||||
<Requests />
|
<Requests />
|
||||||
<ParityBar dapp={ isMinimized } />
|
<ParityBar dapp={ isMinimized } />
|
||||||
|
17
js/src/views/SyncWarning/index.js
Normal file
17
js/src/views/SyncWarning/index.js
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
// Copyright 2015-2017 Parity Technologies (UK) Ltd.
|
||||||
|
// This file is part of Parity.
|
||||||
|
|
||||||
|
// Parity is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
|
||||||
|
// Parity is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
export default, { showSyncWarning } from './syncWarning';
|
60
js/src/views/SyncWarning/syncWarning.css
Normal file
60
js/src/views/SyncWarning/syncWarning.css
Normal file
@ -0,0 +1,60 @@
|
|||||||
|
/* Copyright 2015-2017 Parity Technologies (UK) Ltd.
|
||||||
|
/* This file is part of Parity.
|
||||||
|
/*
|
||||||
|
/* Parity is free software: you can redistribute it and/or modify
|
||||||
|
/* it under the terms of the GNU General Public License as published by
|
||||||
|
/* the Free Software Foundation; either version 3 of the License; or
|
||||||
|
/* (at your option) any later version.
|
||||||
|
/*
|
||||||
|
/* Parity is distributed in the hope that it will be useful;
|
||||||
|
/* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
/* GNU General Public License for more details.
|
||||||
|
/*
|
||||||
|
/* You should have received a copy of the GNU General Public License
|
||||||
|
/* along with Parity. If not; see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
.overlay {
|
||||||
|
background: rgba(255, 255, 255, 0.75);
|
||||||
|
bottom: 0;
|
||||||
|
left: 0;
|
||||||
|
position: fixed;
|
||||||
|
right: 0;
|
||||||
|
top: 0;
|
||||||
|
z-index: 10000;
|
||||||
|
}
|
||||||
|
|
||||||
|
.modal {
|
||||||
|
align-items: flex-start;
|
||||||
|
bottom: 0;
|
||||||
|
display: flex;
|
||||||
|
left: 0;
|
||||||
|
position: fixed;
|
||||||
|
right: 0;
|
||||||
|
top: 0;
|
||||||
|
z-index: 10001;
|
||||||
|
}
|
||||||
|
|
||||||
|
.body {
|
||||||
|
background: rgba(25, 25, 25, 0.75);
|
||||||
|
box-shadow: rgba(0, 0, 0, 0.25) 0 14px 45px, rgba(0, 0, 0, 0.22) 0 10px 18px;
|
||||||
|
color: rgb(208, 208, 208);
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
margin: 0 auto;
|
||||||
|
max-width: 20em;
|
||||||
|
padding: 2em 4em;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.button {
|
||||||
|
margin-top: 1em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.body,
|
||||||
|
.button {
|
||||||
|
> * {
|
||||||
|
margin: 0.5em 0;
|
||||||
|
}
|
||||||
|
}
|
130
js/src/views/SyncWarning/syncWarning.js
Normal file
130
js/src/views/SyncWarning/syncWarning.js
Normal file
@ -0,0 +1,130 @@
|
|||||||
|
// Copyright 2015-2017 Parity Technologies (UK) Ltd.
|
||||||
|
// This file is part of Parity.
|
||||||
|
|
||||||
|
// Parity is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
|
||||||
|
// Parity is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
import { Checkbox } from 'material-ui';
|
||||||
|
import React, { Component, PropTypes } from 'react';
|
||||||
|
import { FormattedMessage } from 'react-intl';
|
||||||
|
import { connect } from 'react-redux';
|
||||||
|
import store from 'store';
|
||||||
|
|
||||||
|
import { Button } from '~/ui';
|
||||||
|
|
||||||
|
import styles from './syncWarning.css';
|
||||||
|
|
||||||
|
const LS_DONT_SHOW_AGAIN = '_parity::syncWarning::dontShowAgain';
|
||||||
|
|
||||||
|
export const showSyncWarning = () => {
|
||||||
|
const dontShowAgain = store.get(LS_DONT_SHOW_AGAIN);
|
||||||
|
|
||||||
|
if (dontShowAgain === undefined || dontShowAgain === null) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return !dontShowAgain;
|
||||||
|
};
|
||||||
|
|
||||||
|
class SyncWarning extends Component {
|
||||||
|
static propTypes = {
|
||||||
|
isSyncing: PropTypes.bool
|
||||||
|
};
|
||||||
|
|
||||||
|
state = {
|
||||||
|
dontShowAgain: false,
|
||||||
|
show: true
|
||||||
|
};
|
||||||
|
|
||||||
|
render () {
|
||||||
|
const { isSyncing } = this.props;
|
||||||
|
const { dontShowAgain, show } = this.state;
|
||||||
|
|
||||||
|
if (!isSyncing || isSyncing === null || !show) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
<div className={ styles.overlay } />
|
||||||
|
<div className={ styles.modal }>
|
||||||
|
<div className={ styles.body }>
|
||||||
|
<FormattedMessage
|
||||||
|
id='syncWarning.message.line1'
|
||||||
|
defaultMessage={ `
|
||||||
|
Your Parity node is still syncing to the chain.
|
||||||
|
` }
|
||||||
|
/>
|
||||||
|
<FormattedMessage
|
||||||
|
id='syncWarning.message.line2'
|
||||||
|
defaultMessage={ `
|
||||||
|
Some of the shown information might be out-of-date.
|
||||||
|
` }
|
||||||
|
/>
|
||||||
|
|
||||||
|
<div className={ styles.button }>
|
||||||
|
<Checkbox
|
||||||
|
label={
|
||||||
|
<FormattedMessage
|
||||||
|
id='syncWarning.dontShowAgain.label'
|
||||||
|
defaultMessage='Do not show this warning again'
|
||||||
|
/>
|
||||||
|
}
|
||||||
|
checked={ dontShowAgain }
|
||||||
|
onCheck={ this.handleCheck }
|
||||||
|
/>
|
||||||
|
<Button
|
||||||
|
label={
|
||||||
|
<FormattedMessage
|
||||||
|
id='syncWarning.understandBtn.label'
|
||||||
|
defaultMessage='I understand'
|
||||||
|
/>
|
||||||
|
}
|
||||||
|
onClick={ this.handleAgreeClick }
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
handleCheck = () => {
|
||||||
|
this.setState({ dontShowAgain: !this.state.dontShowAgain });
|
||||||
|
}
|
||||||
|
|
||||||
|
handleAgreeClick = () => {
|
||||||
|
if (this.state.dontShowAgain) {
|
||||||
|
store.set(LS_DONT_SHOW_AGAIN, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.setState({ show: false });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function mapStateToProps (state) {
|
||||||
|
const { syncing } = state.nodeStatus;
|
||||||
|
// syncing could be an Object, false, or null
|
||||||
|
const isSyncing = syncing
|
||||||
|
? true
|
||||||
|
: syncing;
|
||||||
|
|
||||||
|
return {
|
||||||
|
isSyncing
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export default connect(
|
||||||
|
mapStateToProps,
|
||||||
|
null
|
||||||
|
)(SyncWarning);
|
57
js/src/views/SyncWarning/syncWarning.spec.js
Normal file
57
js/src/views/SyncWarning/syncWarning.spec.js
Normal file
@ -0,0 +1,57 @@
|
|||||||
|
// Copyright 2015-2017 Parity Technologies (UK) Ltd.
|
||||||
|
// This file is part of Parity.
|
||||||
|
|
||||||
|
// Parity is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
|
||||||
|
// Parity is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
import { shallow } from 'enzyme';
|
||||||
|
import React from 'react';
|
||||||
|
|
||||||
|
import SyncWarning from './';
|
||||||
|
|
||||||
|
let component;
|
||||||
|
|
||||||
|
function createRedux (syncing = null) {
|
||||||
|
return {
|
||||||
|
getState: () => {
|
||||||
|
return {
|
||||||
|
nodeStatus: {
|
||||||
|
syncing
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function render (store) {
|
||||||
|
component = shallow(
|
||||||
|
<SyncWarning />,
|
||||||
|
{ context: { store: store || createRedux() } }
|
||||||
|
).find('SyncWarning').shallow();
|
||||||
|
|
||||||
|
return component;
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('views/SyncWarning', () => {
|
||||||
|
it('renders defaults', () => {
|
||||||
|
expect(render()).to.be.ok;
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does render when syncing', () => {
|
||||||
|
expect(render(createRedux({})).find('div')).to.have.length.gte(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not render when not syncing', () => {
|
||||||
|
expect(render(createRedux(false)).find('div')).to.have.length(0);
|
||||||
|
});
|
||||||
|
});
|
Loading…
Reference in New Issue
Block a user