diff options
Diffstat (limited to 'server/sonar-web')
3 files changed, 9 insertions, 18 deletions
diff --git a/server/sonar-web/src/main/js/apps/settings/components/inputs/InputForSecured.tsx b/server/sonar-web/src/main/js/apps/settings/components/inputs/InputForSecured.tsx index fb6f21e509c..23bdb1d0edd 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/inputs/InputForSecured.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/inputs/InputForSecured.tsx @@ -42,7 +42,7 @@ export default class InputForSecured extends React.PureComponent<Props, State> { changing: !this.props.setting.hasValue }; - componentWillReceiveProps(nextProps: Props) { + componentDidUpdate(prevProps: Props) { /* * Reset `changing` if: * - the value is reset (valueChanged -> !valueChanged) @@ -50,10 +50,10 @@ export default class InputForSecured extends React.PureComponent<Props, State> { * - the value changes from outside the input (i.e. store update/reset/cancel) */ if ( - (this.props.hasValueChanged || this.props.setting !== nextProps.setting) && - !nextProps.hasValueChanged + (prevProps.hasValueChanged || this.props.setting !== prevProps.setting) && + !this.props.hasValueChanged ) { - this.setState({ changing: !nextProps.setting.hasValue }); + this.setState({ changing: !this.props.setting.hasValue }); } } diff --git a/server/sonar-web/src/main/js/apps/system/components/ChangeLogLevelForm.tsx b/server/sonar-web/src/main/js/apps/system/components/ChangeLogLevelForm.tsx index b1f219464af..0e2a643b97e 100644 --- a/server/sonar-web/src/main/js/apps/system/components/ChangeLogLevelForm.tsx +++ b/server/sonar-web/src/main/js/apps/system/components/ChangeLogLevelForm.tsx @@ -28,7 +28,7 @@ import { LOGS_LEVELS } from '../utils'; interface Props { infoMsg: string; logLevel: string; - onChange: (level: string) => void; + onChange: () => void; onClose: () => void; } @@ -49,7 +49,7 @@ export default class ChangeLogLevelForm extends React.PureComponent<Props, State if (!this.state.updating) { this.setState({ updating: true }); setLogLevel(newLevel).then( - () => this.props.onChange(newLevel), + () => this.props.onChange(), () => this.setState({ updating: false }) ); } diff --git a/server/sonar-web/src/main/js/apps/system/components/PageActions.tsx b/server/sonar-web/src/main/js/apps/system/components/PageActions.tsx index b7f1c1bd909..527ec1b1ee7 100644 --- a/server/sonar-web/src/main/js/apps/system/components/PageActions.tsx +++ b/server/sonar-web/src/main/js/apps/system/components/PageActions.tsx @@ -38,7 +38,6 @@ interface Props { } interface State { - logLevel: string; openLogsLevelForm: boolean; } @@ -46,23 +45,15 @@ export default class PageActions extends React.PureComponent<Props, State> { constructor(props: Props) { super(props); this.state = { - logLevel: props.logLevel, openLogsLevelForm: false }; } - componentWillReceiveProps(nextProps: Props) { - if (nextProps.logLevel !== this.state.logLevel) { - this.setState({ logLevel: nextProps.logLevel }); - } - } - handleLogsLevelOpen = () => { this.setState({ openLogsLevelForm: true }); }; - handleLogsLevelChange = (logLevel: string) => { - this.setState({ logLevel }); + handleLogsLevelChange = () => { this.props.onLogLevelChange(); this.handleLogsLevelClose(); }; @@ -84,7 +75,7 @@ export default class PageActions extends React.PureComponent<Props, State> { <span className="text-middle"> {translate('system.logs_level')} {':'} - <strong className="little-spacer-left">{this.state.logLevel}</strong> + <strong className="little-spacer-left">{this.props.logLevel}</strong> </span> <EditButton className="spacer-left button-small" @@ -181,7 +172,7 @@ export default class PageActions extends React.PureComponent<Props, State> { infoMsg={translate( this.props.cluster ? 'system.cluster_log_level.info' : 'system.log_level.info' )} - logLevel={this.state.logLevel} + logLevel={this.props.logLevel} onChange={this.handleLogsLevelChange} onClose={this.handleLogsLevelClose} /> |