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>

2 files changed, 6 insertions, 19 deletions

diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js
index 0f7c29de5..56e5f9c94 100644
--- a/src/components/settings/services/EditServiceForm.js
+++ b/src/components/settings/services/EditServiceForm.js
@@ -145,7 +145,6 @@ export default @observer class EditServiceForm extends Component {
     isSaving: PropTypes.bool.isRequired,
     isDeleting: PropTypes.bool.isRequired,
     isProxyFeatureEnabled: PropTypes.bool.isRequired,
-    isHibernationFeatureActive: PropTypes.bool.isRequired,
   };
 
   static defaultProps = {
@@ -208,7 +207,6 @@ export default @observer class EditServiceForm extends Component {
       onDelete,
       openRecipeFile,
       isProxyFeatureEnabled,
-      isHibernationFeatureActive,
     } = this.props;
     const { intl } = this.context;
 
@@ -341,14 +339,10 @@ export default @observer class EditServiceForm extends Component {
                 <div className="settings__settings-group">
                   <h3>{intl.formatMessage(messages.headlineGeneral)}</h3>
                   <Toggle field={form.$('isEnabled')} />
-                  {isHibernationFeatureActive && (
-                    <>
-                      <Toggle field={form.$('isHibernationEnabled')} />
-                      <p className="settings__help indented__help">
-                        {intl.formatMessage(messages.isHibernationEnabledInfo)}
-                      </p>
-                    </>
-                  )}
+                  <Toggle field={form.$('isHibernationEnabled')} />
+                  <p className="settings__help indented__help">
+                    {intl.formatMessage(messages.isHibernationEnabledInfo)}
+                  </p>
                   <Toggle field={form.$('isDarkModeEnabled')} />
                   {form.$('isDarkModeEnabled').value
                     && (
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index a8ba8748d..d2a9eb6e0 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -171,7 +171,6 @@ export default @observer class EditSettingsForm extends Component {
     isTodosActivated: PropTypes.bool.isRequired,
     isWorkspaceEnabled: PropTypes.bool.isRequired,
     automaticUpdates: PropTypes.bool.isRequired,
-    hibernationEnabled: PropTypes.bool.isRequired,
     isDarkmodeEnabled: PropTypes.bool.isRequired,
     isAdaptableDarkModeEnabled: PropTypes.bool.isRequired,
     isNightlyEnabled: PropTypes.bool.isRequired,
@@ -225,7 +224,6 @@ export default @observer class EditSettingsForm extends Component {
       isTodosEnabled,
       isWorkspaceEnabled,
       automaticUpdates,
-      hibernationEnabled,
       isDarkmodeEnabled,
       isTodosActivated,
       isNightlyEnabled,
@@ -336,13 +334,8 @@ export default @observer class EditSettingsForm extends Component {
 
                 <Hr />
 
-                <Toggle field={form.$('hibernate')} />
-                {hibernationEnabled && (
-                  <>
-                    <Select field={form.$('hibernationStrategy')} />
-                    <Toggle field={form.$('hibernateOnStartup')} />
-                  </>
-                )}
+                <Select field={form.$('hibernationStrategy')} />
+                <Toggle field={form.$('hibernateOnStartup')} />
                 <p
                   className="settings__message"
                   style={{