diff options
author | Markus Hatvan <markus_hatvan@aon.at> | 2021-07-02 19:49:55 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-03 07:19:55 +0530 |
commit | 33123c354b79f7951423dd75097b11e7eb075f99 (patch) | |
tree | 29f6e857f02d0e0fc67d89a657a54a865ed5538a /src/components/services/content | |
parent | Minor refactoring to move all runtime configs from 'config.js' into 'environm... (diff) | |
download | ferdium-app-33123c354b79f7951423dd75097b11e7eb075f99.tar.gz ferdium-app-33123c354b79f7951423dd75097b11e7eb075f99.tar.zst ferdium-app-33123c354b79f7951423dd75097b11e7eb075f99.zip |
Upgrade various dependencies to latest part 2 (#1557)
* Upgrade various dependencies to latest, remove unnecessary electron-hunspell
- upgrade eslint and friends to latest
- remove deprecated 'node-sass' in favor of 'sass'
- disable new rules from 'eslint-config-airbnb' that are conflicting with current code style
- add workspace config for 'vscode' that silences 'experimentalDecorator' warning and forces 'prettier' to single quote
* Run yarn lint to autofix with new ruleset and worked down lint issues to zero
Diffstat (limited to 'src/components/services/content')
-rw-r--r-- | src/components/services/content/ServiceView.js | 8 | ||||
-rw-r--r-- | src/components/services/content/Services.js | 1 | ||||
-rw-r--r-- | src/components/services/content/WebviewCrashHandler.js | 1 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js index 444d5fea4..3c0fed32b 100644 --- a/src/components/services/content/ServiceView.js +++ b/src/components/services/content/ServiceView.js | |||
@@ -109,7 +109,7 @@ export default @inject('stores', 'actions') @observer class ServiceView extends | |||
109 | return ( | 109 | return ( |
110 | <div className={webviewClasses}> | 110 | <div className={webviewClasses}> |
111 | {service.isActive && service.isEnabled && ( | 111 | {service.isActive && service.isEnabled && ( |
112 | <Fragment> | 112 | <> |
113 | {service.hasCrashed && ( | 113 | {service.hasCrashed && ( |
114 | <WebviewCrashHandler | 114 | <WebviewCrashHandler |
115 | name={service.recipe.name} | 115 | name={service.recipe.name} |
@@ -131,10 +131,10 @@ export default @inject('stores', 'actions') @observer class ServiceView extends | |||
131 | edit={edit} | 131 | edit={edit} |
132 | /> | 132 | /> |
133 | )} | 133 | )} |
134 | </Fragment> | 134 | </> |
135 | )} | 135 | )} |
136 | {!service.isEnabled ? ( | 136 | {!service.isEnabled ? ( |
137 | <Fragment> | 137 | <> |
138 | {service.isActive && ( | 138 | {service.isActive && ( |
139 | <ServiceDisabled | 139 | <ServiceDisabled |
140 | name={service.recipe.name} | 140 | name={service.recipe.name} |
@@ -142,7 +142,7 @@ export default @inject('stores', 'actions') @observer class ServiceView extends | |||
142 | enable={enable} | 142 | enable={enable} |
143 | /> | 143 | /> |
144 | )} | 144 | )} |
145 | </Fragment> | 145 | </> |
146 | ) : ( | 146 | ) : ( |
147 | <> | 147 | <> |
148 | {(!service.isHibernating || service.isHibernationEnabled) ? ( | 148 | {(!service.isHibernating || service.isHibernationEnabled) ? ( |
diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js index 7cf02c237..caa3cf9aa 100644 --- a/src/components/services/content/Services.js +++ b/src/components/services/content/Services.js | |||
@@ -34,7 +34,6 @@ const messages = defineMessages({ | |||
34 | }, | 34 | }, |
35 | }); | 35 | }); |
36 | 36 | ||
37 | |||
38 | const styles = { | 37 | const styles = { |
39 | confettiContainer: { | 38 | confettiContainer: { |
40 | position: 'absolute', | 39 | position: 'absolute', |
diff --git a/src/components/services/content/WebviewCrashHandler.js b/src/components/services/content/WebviewCrashHandler.js index 7a69dba87..b62940c06 100644 --- a/src/components/services/content/WebviewCrashHandler.js +++ b/src/components/services/content/WebviewCrashHandler.js | |||
@@ -43,7 +43,6 @@ export default @observer class WebviewCrashHandler extends Component { | |||
43 | 43 | ||
44 | countdownIntervalTimeout = ms('1s'); | 44 | countdownIntervalTimeout = ms('1s'); |
45 | 45 | ||
46 | |||
47 | componentDidMount() { | 46 | componentDidMount() { |
48 | const { reload } = this.props; | 47 | const { reload } = this.props; |
49 | 48 | ||