diff options
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/layout/Sidebar.js | 12 | ||||
-rw-r--r-- | src/components/services/content/ServiceView.js | 16 | ||||
-rw-r--r-- | src/components/services/tabs/TabBarSortableList.js | 6 | ||||
-rw-r--r-- | src/components/services/tabs/TabItem.js | 18 | ||||
-rw-r--r-- | src/components/services/tabs/Tabbar.js | 16 | ||||
-rw-r--r-- | src/components/settings/services/EditServiceForm.js | 14 | ||||
-rw-r--r-- | src/components/settings/settings/EditSettingsForm.js | 11 |
7 files changed, 64 insertions, 29 deletions
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js index 802538eba..9f3cacd38 100644 --- a/src/components/layout/Sidebar.js +++ b/src/components/layout/Sidebar.js | |||
@@ -58,6 +58,18 @@ const messages = defineMessages({ | |||
58 | export default @inject('stores', 'actions') @observer class Sidebar extends Component { | 58 | export default @inject('stores', 'actions') @observer class Sidebar extends Component { |
59 | static propTypes = { | 59 | static propTypes = { |
60 | openSettings: PropTypes.func.isRequired, | 60 | openSettings: PropTypes.func.isRequired, |
61 | closeSettings: PropTypes.func.isRequired, | ||
62 | setActive: PropTypes.func.isRequired, | ||
63 | reorder: PropTypes.func.isRequired, | ||
64 | reload: PropTypes.func.isRequired, | ||
65 | toggleNotifications: PropTypes.func.isRequired, | ||
66 | toggleAudio: PropTypes.func.isRequired, | ||
67 | showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired, | ||
68 | showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired, | ||
69 | deleteService: PropTypes.func.isRequired, | ||
70 | updateService: PropTypes.func.isRequired, | ||
71 | hibernateService: PropTypes.func.isRequired, | ||
72 | wakeUpService: PropTypes.func.isRequired, | ||
61 | toggleMuteApp: PropTypes.func.isRequired, | 73 | toggleMuteApp: PropTypes.func.isRequired, |
62 | isAppMuted: PropTypes.bool.isRequired, | 74 | isAppMuted: PropTypes.bool.isRequired, |
63 | isWorkspaceDrawerOpen: PropTypes.bool.isRequired, | 75 | isWorkspaceDrawerOpen: PropTypes.bool.isRequired, |
diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js index 17d2db5a0..3fc084ff0 100644 --- a/src/components/services/content/ServiceView.js +++ b/src/components/services/content/ServiceView.js | |||
@@ -145,19 +145,17 @@ export default @inject('stores', 'actions') @observer class ServiceView extends | |||
145 | </> | 145 | </> |
146 | ) : ( | 146 | ) : ( |
147 | <> | 147 | <> |
148 | {(!service.isHibernating || service.isHibernationEnabled) ? ( | 148 | {!service.isHibernating ? ( |
149 | <> | 149 | <> |
150 | {showNavBar && ( | 150 | {showNavBar && ( |
151 | <WebControlsScreen service={service} /> | 151 | <WebControlsScreen service={service} /> |
152 | )} | 152 | )} |
153 | {!service.isHibernating && ( | 153 | <ServiceWebview |
154 | <ServiceWebview | 154 | service={service} |
155 | service={service} | 155 | setWebviewReference={setWebviewReference} |
156 | setWebviewReference={setWebviewReference} | 156 | detachService={detachService} |
157 | detachService={detachService} | 157 | isSpellcheckerEnabled={isSpellcheckerEnabled} |
158 | isSpellcheckerEnabled={isSpellcheckerEnabled} | 158 | /> |
159 | /> | ||
160 | )} | ||
161 | </> | 159 | </> |
162 | ) : ( | 160 | ) : ( |
163 | <div> | 161 | <div> |
diff --git a/src/components/services/tabs/TabBarSortableList.js b/src/components/services/tabs/TabBarSortableList.js index 489027d57..f12d90602 100644 --- a/src/components/services/tabs/TabBarSortableList.js +++ b/src/components/services/tabs/TabBarSortableList.js | |||
@@ -17,6 +17,8 @@ class TabBarSortableList extends Component { | |||
17 | deleteService: PropTypes.func.isRequired, | 17 | deleteService: PropTypes.func.isRequired, |
18 | disableService: PropTypes.func.isRequired, | 18 | disableService: PropTypes.func.isRequired, |
19 | enableService: PropTypes.func.isRequired, | 19 | enableService: PropTypes.func.isRequired, |
20 | hibernateService: PropTypes.func.isRequired, | ||
21 | wakeUpService: PropTypes.func.isRequired, | ||
20 | showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired, | 22 | showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired, |
21 | showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired, | 23 | showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired, |
22 | } | 24 | } |
@@ -31,6 +33,8 @@ class TabBarSortableList extends Component { | |||
31 | deleteService, | 33 | deleteService, |
32 | disableService, | 34 | disableService, |
33 | enableService, | 35 | enableService, |
36 | hibernateService, | ||
37 | wakeUpService, | ||
34 | openSettings, | 38 | openSettings, |
35 | showMessageBadgeWhenMutedSetting, | 39 | showMessageBadgeWhenMutedSetting, |
36 | showMessageBadgesEvenWhenMuted, | 40 | showMessageBadgesEvenWhenMuted, |
@@ -53,6 +57,8 @@ class TabBarSortableList extends Component { | |||
53 | deleteService={() => deleteService({ serviceId: service.id })} | 57 | deleteService={() => deleteService({ serviceId: service.id })} |
54 | disableService={() => disableService({ serviceId: service.id })} | 58 | disableService={() => disableService({ serviceId: service.id })} |
55 | enableService={() => enableService({ serviceId: service.id })} | 59 | enableService={() => enableService({ serviceId: service.id })} |
60 | hibernateService={() => hibernateService({ serviceId: service.id })} | ||
61 | wakeUpService={() => wakeUpService({ serviceId: service.id })} | ||
56 | openSettings={openSettings} | 62 | openSettings={openSettings} |
57 | showMessageBadgeWhenMutedSetting={showMessageBadgeWhenMutedSetting} | 63 | showMessageBadgeWhenMutedSetting={showMessageBadgeWhenMutedSetting} |
58 | showMessageBadgesEvenWhenMuted={showMessageBadgesEvenWhenMuted} | 64 | showMessageBadgesEvenWhenMuted={showMessageBadgesEvenWhenMuted} |
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js index 5c3149a11..ccf3333f8 100644 --- a/src/components/services/tabs/TabItem.js +++ b/src/components/services/tabs/TabItem.js | |||
@@ -49,6 +49,14 @@ const messages = defineMessages({ | |||
49 | id: 'tabs.item.enableService', | 49 | id: 'tabs.item.enableService', |
50 | defaultMessage: '!!!Enable Service', | 50 | defaultMessage: '!!!Enable Service', |
51 | }, | 51 | }, |
52 | hibernateService: { | ||
53 | id: 'tabs.item.hibernateService', | ||
54 | defaultMessage: '!!!Hibernate Service', | ||
55 | }, | ||
56 | wakeUpService: { | ||
57 | id: 'tabs.item.wakeUpService', | ||
58 | defaultMessage: '!!!Wake Up Service', | ||
59 | }, | ||
52 | deleteService: { | 60 | deleteService: { |
53 | id: 'tabs.item.deleteService', | 61 | id: 'tabs.item.deleteService', |
54 | defaultMessage: '!!!Delete Service', | 62 | defaultMessage: '!!!Delete Service', |
@@ -101,6 +109,8 @@ const styles = { | |||
101 | deleteService: PropTypes.func.isRequired, | 109 | deleteService: PropTypes.func.isRequired, |
102 | disableService: PropTypes.func.isRequired, | 110 | disableService: PropTypes.func.isRequired, |
103 | enableService: PropTypes.func.isRequired, | 111 | enableService: PropTypes.func.isRequired, |
112 | hibernateService: PropTypes.func.isRequired, | ||
113 | wakeUpService: PropTypes.func.isRequired, | ||
104 | showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired, | 114 | showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired, |
105 | showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired, | 115 | showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired, |
106 | }; | 116 | }; |
@@ -145,6 +155,8 @@ const styles = { | |||
145 | deleteService, | 155 | deleteService, |
146 | disableService, | 156 | disableService, |
147 | enableService, | 157 | enableService, |
158 | hibernateService, | ||
159 | wakeUpService, | ||
148 | openSettings, | 160 | openSettings, |
149 | showMessageBadgeWhenMutedSetting, | 161 | showMessageBadgeWhenMutedSetting, |
150 | showMessageBadgesEvenWhenMuted, | 162 | showMessageBadgesEvenWhenMuted, |
@@ -181,6 +193,10 @@ const styles = { | |||
181 | label: intl.formatMessage(service.isEnabled ? messages.disableService : messages.enableService), | 193 | label: intl.formatMessage(service.isEnabled ? messages.disableService : messages.enableService), |
182 | click: () => (service.isEnabled ? disableService() : enableService()), | 194 | click: () => (service.isEnabled ? disableService() : enableService()), |
183 | }, { | 195 | }, { |
196 | label: intl.formatMessage(service.isHibernating ? messages.wakeUpService : messages.hibernateService), | ||
197 | click: () => (service.isHibernating ? wakeUpService() : hibernateService()), | ||
198 | enabled: service.canHibernate, | ||
199 | }, { | ||
184 | type: 'separator', | 200 | type: 'separator', |
185 | }, { | 201 | }, { |
186 | label: intl.formatMessage(messages.deleteService), | 202 | label: intl.formatMessage(messages.deleteService), |
@@ -217,7 +233,7 @@ const styles = { | |||
217 | • | 233 | • |
218 | </span> | 234 | </span> |
219 | )} | 235 | )} |
220 | {service.isHibernating && !service.isHibernationEnabled && ( | 236 | {service.isHibernating && ( |
221 | <span className="tab-item__message-count hibernating"> | 237 | <span className="tab-item__message-count hibernating"> |
222 | • | 238 | • |
223 | </span> | 239 | </span> |
diff --git a/src/components/services/tabs/Tabbar.js b/src/components/services/tabs/Tabbar.js index 5e8260ad0..db7a69bfc 100644 --- a/src/components/services/tabs/Tabbar.js +++ b/src/components/services/tabs/Tabbar.js | |||
@@ -17,6 +17,8 @@ export default @observer class TabBar extends Component { | |||
17 | toggleAudio: PropTypes.func.isRequired, | 17 | toggleAudio: PropTypes.func.isRequired, |
18 | deleteService: PropTypes.func.isRequired, | 18 | deleteService: PropTypes.func.isRequired, |
19 | updateService: PropTypes.func.isRequired, | 19 | updateService: PropTypes.func.isRequired, |
20 | hibernateService: PropTypes.func.isRequired, | ||
21 | wakeUpService: PropTypes.func.isRequired, | ||
20 | showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired, | 22 | showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired, |
21 | showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired, | 23 | showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired, |
22 | }; | 24 | }; |
@@ -55,6 +57,18 @@ export default @observer class TabBar extends Component { | |||
55 | this.toggleService({ serviceId, isEnabled: true }); | 57 | this.toggleService({ serviceId, isEnabled: true }); |
56 | } | 58 | } |
57 | 59 | ||
60 | hibernateService({ serviceId }) { | ||
61 | if (serviceId) { | ||
62 | this.props.hibernateService({ serviceId }); | ||
63 | } | ||
64 | } | ||
65 | |||
66 | wakeUpService({ serviceId }) { | ||
67 | if (serviceId) { | ||
68 | this.props.wakeUpService({ serviceId }); | ||
69 | } | ||
70 | } | ||
71 | |||
58 | render() { | 72 | render() { |
59 | const { | 73 | const { |
60 | services, | 74 | services, |
@@ -83,6 +97,8 @@ export default @observer class TabBar extends Component { | |||
83 | deleteService={deleteService} | 97 | deleteService={deleteService} |
84 | disableService={args => this.disableService(args)} | 98 | disableService={args => this.disableService(args)} |
85 | enableService={args => this.enableService(args)} | 99 | enableService={args => this.enableService(args)} |
100 | hibernateService={args => this.hibernateService(args)} | ||
101 | wakeUpService={args => this.wakeUpService(args)} | ||
86 | openSettings={openSettings} | 102 | openSettings={openSettings} |
87 | distance={20} | 103 | distance={20} |
88 | axis="y" | 104 | axis="y" |
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={{ |