diff options
author | 2021-07-23 10:04:43 +0100 | |
---|---|---|
committer | 2021-07-23 11:04:43 +0200 | |
commit | 012e55ebf87559f2d782e5400fb885df8b80a445 (patch) | |
tree | 1966e58defe2bcd9541ca9a3f4db67a95a6b4249 /src/containers/settings/EditServiceScreen.js | |
parent | Removed references to 'premium' i18n keys that are no longer used. (diff) | |
download | ferdium-app-012e55ebf87559f2d782e5400fb885df8b80a445.tar.gz ferdium-app-012e55ebf87559f2d782e5400fb885df8b80a445.tar.zst ferdium-app-012e55ebf87559f2d782e5400fb885df8b80a445.zip |
Fix hibernation mode (#1486)
* Use hibernation strategy from settings instead of hardcoded 5 minutes
* Fix conditions with isHibernationEnabled, previously disableHibernation
* Make service hibernation obey global setting
Also refactors hibernation to move some hibernation enablement logic
into the Service model
* Remove global hibernation enable switch
Implements option 4 from
https://github.com/getferdi/ferdi/pull/1486#issuecomment-860290992
according to
https://github.com/getferdi/ferdi/pull/1486#issuecomment-876558694
* Implements #865 : Add 'hibernate service' and 'wake up service' in the sidebar context menu.
* Removed 'hibernationEnabled' check on main settings screen
Since this is an (imo) incongruous behavior for the first time user.
They will see a message, but with no ability to choose the hibernation strategy.
* Autogenerated files from conflict fixes
Co-authored-by: Kristóf Marussy <kristof@marussy.com>
Co-authored-by: Vijay A <avijayr@protonmail.com>
Diffstat (limited to 'src/containers/settings/EditServiceScreen.js')
-rw-r--r-- | src/containers/settings/EditServiceScreen.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js index e22e91822..0fe84792f 100644 --- a/src/containers/settings/EditServiceScreen.js +++ b/src/containers/settings/EditServiceScreen.js | |||
@@ -345,7 +345,7 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex | |||
345 | 345 | ||
346 | render() { | 346 | render() { |
347 | const { | 347 | const { |
348 | recipes, services, user, settings, | 348 | recipes, services, user, |
349 | } = this.props.stores; | 349 | } = this.props.stores; |
350 | const { action } = this.props.router.params; | 350 | const { action } = this.props.router.params; |
351 | 351 | ||
@@ -398,7 +398,6 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex | |||
398 | onDelete={() => this.deleteService()} | 398 | onDelete={() => this.deleteService()} |
399 | openRecipeFile={file => this.openRecipeFile(file)} | 399 | openRecipeFile={file => this.openRecipeFile(file)} |
400 | isProxyFeatureEnabled={proxyFeature.isEnabled} | 400 | isProxyFeatureEnabled={proxyFeature.isEnabled} |
401 | isHibernationFeatureActive={settings.app.hibernate} | ||
402 | /> | 401 | /> |
403 | </ErrorBoundary> | 402 | </ErrorBoundary> |
404 | ); | 403 | ); |