diff options
author | kytwb <412895+kytwb@users.noreply.github.com> | 2021-07-23 10:04:43 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-23 11:04:43 +0200 |
commit | 012e55ebf87559f2d782e5400fb885df8b80a445 (patch) | |
tree | 1966e58defe2bcd9541ca9a3f4db67a95a6b4249 /src/components/settings | |
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/components/settings')
-rw-r--r-- | src/components/settings/services/EditServiceForm.js | 14 | ||||
-rw-r--r-- | src/components/settings/settings/EditSettingsForm.js | 11 |
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 { | |||
145 | isSaving: PropTypes.bool.isRequired, | 145 | isSaving: PropTypes.bool.isRequired, |
146 | isDeleting: PropTypes.bool.isRequired, | 146 | isDeleting: PropTypes.bool.isRequired, |
147 | isProxyFeatureEnabled: PropTypes.bool.isRequired, | 147 | isProxyFeatureEnabled: PropTypes.bool.isRequired, |
148 | isHibernationFeatureActive: PropTypes.bool.isRequired, | ||
149 | }; | 148 | }; |
150 | 149 | ||
151 | static defaultProps = { | 150 | static defaultProps = { |
@@ -208,7 +207,6 @@ export default @observer class EditServiceForm extends Component { | |||
208 | onDelete, | 207 | onDelete, |
209 | openRecipeFile, | 208 | openRecipeFile, |
210 | isProxyFeatureEnabled, | 209 | isProxyFeatureEnabled, |
211 | isHibernationFeatureActive, | ||
212 | } = this.props; | 210 | } = this.props; |
213 | const { intl } = this.context; | 211 | const { intl } = this.context; |
214 | 212 | ||
@@ -341,14 +339,10 @@ export default @observer class EditServiceForm extends Component { | |||
341 | <div className="settings__settings-group"> | 339 | <div className="settings__settings-group"> |
342 | <h3>{intl.formatMessage(messages.headlineGeneral)}</h3> | 340 | <h3>{intl.formatMessage(messages.headlineGeneral)}</h3> |
343 | <Toggle field={form.$('isEnabled')} /> | 341 | <Toggle field={form.$('isEnabled')} /> |
344 | {isHibernationFeatureActive && ( | 342 | <Toggle field={form.$('isHibernationEnabled')} /> |
345 | <> | 343 | <p className="settings__help indented__help"> |
346 | <Toggle field={form.$('isHibernationEnabled')} /> | 344 | {intl.formatMessage(messages.isHibernationEnabledInfo)} |
347 | <p className="settings__help indented__help"> | 345 | </p> |
348 | {intl.formatMessage(messages.isHibernationEnabledInfo)} | ||
349 | </p> | ||
350 | </> | ||
351 | )} | ||
352 | <Toggle field={form.$('isDarkModeEnabled')} /> | 346 | <Toggle field={form.$('isDarkModeEnabled')} /> |
353 | {form.$('isDarkModeEnabled').value | 347 | {form.$('isDarkModeEnabled').value |
354 | && ( | 348 | && ( |
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 { | |||
171 | isTodosActivated: PropTypes.bool.isRequired, | 171 | isTodosActivated: PropTypes.bool.isRequired, |
172 | isWorkspaceEnabled: PropTypes.bool.isRequired, | 172 | isWorkspaceEnabled: PropTypes.bool.isRequired, |
173 | automaticUpdates: PropTypes.bool.isRequired, | 173 | automaticUpdates: PropTypes.bool.isRequired, |
174 | hibernationEnabled: PropTypes.bool.isRequired, | ||
175 | isDarkmodeEnabled: PropTypes.bool.isRequired, | 174 | isDarkmodeEnabled: PropTypes.bool.isRequired, |
176 | isAdaptableDarkModeEnabled: PropTypes.bool.isRequired, | 175 | isAdaptableDarkModeEnabled: PropTypes.bool.isRequired, |
177 | isNightlyEnabled: PropTypes.bool.isRequired, | 176 | isNightlyEnabled: PropTypes.bool.isRequired, |
@@ -225,7 +224,6 @@ export default @observer class EditSettingsForm extends Component { | |||
225 | isTodosEnabled, | 224 | isTodosEnabled, |
226 | isWorkspaceEnabled, | 225 | isWorkspaceEnabled, |
227 | automaticUpdates, | 226 | automaticUpdates, |
228 | hibernationEnabled, | ||
229 | isDarkmodeEnabled, | 227 | isDarkmodeEnabled, |
230 | isTodosActivated, | 228 | isTodosActivated, |
231 | isNightlyEnabled, | 229 | isNightlyEnabled, |
@@ -336,13 +334,8 @@ export default @observer class EditSettingsForm extends Component { | |||
336 | 334 | ||
337 | <Hr /> | 335 | <Hr /> |
338 | 336 | ||
339 | <Toggle field={form.$('hibernate')} /> | 337 | <Select field={form.$('hibernationStrategy')} /> |
340 | {hibernationEnabled && ( | 338 | <Toggle field={form.$('hibernateOnStartup')} /> |
341 | <> | ||
342 | <Select field={form.$('hibernationStrategy')} /> | ||
343 | <Toggle field={form.$('hibernateOnStartup')} /> | ||
344 | </> | ||
345 | )} | ||
346 | <p | 339 | <p |
347 | className="settings__message" | 340 | className="settings__message" |
348 | style={{ | 341 | style={{ |