From 0158c89b21ad6764866bb2770491a91c3516f362 Mon Sep 17 00:00:00 2001 From: Vijay Raghavan Aravamudhan Date: Fri, 23 Jul 2021 17:48:50 +0000 Subject: Added a 'wakeUpStrategy' that the user can control to wake up a previously hibernated service (#1680) --- src/containers/settings/EditSettingsScreen.js | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'src/containers/settings') diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 5f29ee385..764078cb8 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js @@ -11,7 +11,7 @@ import Form from '../../lib/Form'; import { APP_LOCALES, SPELLCHECKER_LOCALES } from '../../i18n/languages'; import { HIBERNATION_STRATEGIES, SIDEBAR_WIDTH, ICON_SIZES, NAVIGATION_BAR_BEHAVIOURS, SEARCH_ENGINE_NAMES, TODO_APPS, - DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED, DEFAULT_IS_FEATURE_ENABLED_BY_USER, + DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED, DEFAULT_IS_FEATURE_ENABLED_BY_USER, WAKE_UP_STRATEGIES, } from '../../config'; import { DEFAULT_APP_SETTINGS, isMac } from '../../environment'; @@ -95,6 +95,10 @@ const messages = defineMessages({ id: 'settings.app.form.hibernationStrategy', defaultMessage: '!!!Hibernation strategy', }, + wakeUpStrategy: { + id: 'settings.app.form.wakeUpStrategy', + defaultMessage: '!!!Wake up strategy', + }, predefinedTodoServer: { id: 'settings.app.form.predefinedTodoServer', defaultMessage: '!!!Todo Server', @@ -255,6 +259,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e hibernate: settingsData.hibernate, hibernateOnStartup: settingsData.hibernateOnStartup, hibernationStrategy: settingsData.hibernationStrategy, + wakeUpStrategy: settingsData.wakeUpStrategy, predefinedTodoServer: settingsData.predefinedTodoServer, customTodoServer: settingsData.customTodoServer, lockingFeatureEnabled: settingsData.lockingFeatureEnabled, @@ -334,6 +339,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e sort: false, }); + const wakeUpStrategies = getSelectOptions({ + locales: WAKE_UP_STRATEGIES, + sort: false, + }); + const todoApp = getSelectOptions({ locales: TODO_APPS, sort: false, @@ -439,6 +449,12 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e options: hibernationStrategies, default: DEFAULT_APP_SETTINGS.hibernationStrategy, }, + wakeUpStrategy: { + label: intl.formatMessage(messages.wakeUpStrategy), + value: settings.all.app.wakeUpStrategy, + options: wakeUpStrategies, + default: DEFAULT_APP_SETTINGS.wakeUpStrategy, + }, predefinedTodoServer: { label: intl.formatMessage(messages.predefinedTodoServer), value: settings.all.app.predefinedTodoServer, -- cgit v1.2.3-54-g00ecf