update main dependencies & fix autofixable eslint warnings (#601)

2 files changed, 11 insertions, 8 deletions

diff --git a/server/sonar-web/src/main/js/apps/settings/encryption/EncryptionApp.js b/server/sonar-web/src/main/js/apps/settings/encryption/EncryptionApp.js
index 5885ca220b0..89f918dd457 100644
--- a/server/sonar-web/src/main/js/apps/settings/encryption/EncryptionApp.js
+++ b/server/sonar-web/src/main/js/apps/settings/encryption/EncryptionApp.js
@@ -43,7 +43,7 @@ export default class EncryptionApp extends React.PureComponent {
 
   render() {
     return (
-      <div id="encryption-page" className="page page-limited">
+      <div className="page page-limited" id="encryption-page">
         <Helmet title={translate('property.category.security.encryption')} />
         <header className="page-header">
           <h1 className="page-title">{translate('property.category.security.encryption')}</h1>
@@ -53,8 +53,8 @@ export default class EncryptionApp extends React.PureComponent {
         {!this.props.loading &&
           !this.props.secretKeyAvailable && (
             <GenerateSecretKeyForm
-              secretKey={this.props.secretKey}
               generateSecretKey={this.props.generateSecretKey}
+              secretKey={this.props.secretKey}
             />
           )}
 
diff --git a/server/sonar-web/src/main/js/apps/settings/encryption/EncryptionAppContainer.js b/server/sonar-web/src/main/js/apps/settings/encryption/EncryptionAppContainer.js
index 95c90a3f2f2..80c24b3527f 100644
--- a/server/sonar-web/src/main/js/apps/settings/encryption/EncryptionAppContainer.js
+++ b/server/sonar-web/src/main/js/apps/settings/encryption/EncryptionAppContainer.js
@@ -27,9 +27,12 @@ import {
 } from '../store/encryptionPage/actions';
 import { getSettingsAppEncryptionState } from '../../../store/rootReducer';
 
-export default connect(state => getSettingsAppEncryptionState(state), {
-  checkSecretKey,
-  generateSecretKey,
-  encryptValue,
-  startGeneration
-})(EncryptionApp);
+export default connect(
+  state => getSettingsAppEncryptionState(state),
+  {
+    checkSecretKey,
+    generateSecretKey,
+    encryptValue,
+    startGeneration
+  }
+)(EncryptionApp);