diff options
Diffstat (limited to 'src/components/settings')
-rw-r--r-- | src/components/settings/navigation/SettingsNavigation.js | 21 | ||||
-rw-r--r-- | src/components/settings/settings/EditSettingsForm.js | 16 |
2 files changed, 14 insertions, 23 deletions
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js index 18a71fdeb..dbb1365b0 100644 --- a/src/components/settings/navigation/SettingsNavigation.js +++ b/src/components/settings/navigation/SettingsNavigation.js | |||
@@ -6,7 +6,6 @@ import { RouterStore } from 'mobx-react-router'; | |||
6 | 6 | ||
7 | import { LOCAL_SERVER, LIVE_FERDI_API, LIVE_FRANZ_API } from '../../../config'; | 7 | import { LOCAL_SERVER, LIVE_FERDI_API, LIVE_FRANZ_API } from '../../../config'; |
8 | import Link from '../../ui/Link'; | 8 | import Link from '../../ui/Link'; |
9 | import { workspaceStore } from '../../../features/workspaces'; | ||
10 | import UIStore from '../../../stores/UIStore'; | 9 | import UIStore from '../../../stores/UIStore'; |
11 | import SettingsStore from '../../../stores/SettingsStore'; | 10 | import SettingsStore from '../../../stores/SettingsStore'; |
12 | import UserStore from '../../../stores/UserStore'; | 11 | import UserStore from '../../../stores/UserStore'; |
@@ -117,17 +116,15 @@ class SettingsNavigation extends Component { | |||
117 | {intl.formatMessage(messages.yourServices)}{' '} | 116 | {intl.formatMessage(messages.yourServices)}{' '} |
118 | <span className="badge">{serviceCount}</span> | 117 | <span className="badge">{serviceCount}</span> |
119 | </Link> | 118 | </Link> |
120 | {workspaceStore.isFeatureEnabled ? ( | 119 | <Link |
121 | <Link | 120 | to="/settings/workspaces" |
122 | to="/settings/workspaces" | 121 | className="settings-navigation__link" |
123 | className="settings-navigation__link" | 122 | activeClassName="is-active" |
124 | activeClassName="is-active" | 123 | disabled={!isLoggedIn} |
125 | disabled={!isLoggedIn} | 124 | > |
126 | > | 125 | {intl.formatMessage(messages.yourWorkspaces)}{' '} |
127 | {intl.formatMessage(messages.yourWorkspaces)}{' '} | 126 | <span className="badge">{workspaceCount}</span> |
128 | <span className="badge">{workspaceCount}</span> | 127 | </Link> |
129 | </Link> | ||
130 | ) : null} | ||
131 | {!isUsingWithoutAccount && ( | 128 | {!isUsingWithoutAccount && ( |
132 | <Link | 129 | <Link |
133 | to="/settings/user" | 130 | to="/settings/user" |
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 60bd91493..54f2025e5 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js | |||
@@ -194,9 +194,7 @@ class EditSettingsForm extends Component { | |||
194 | isClearingAllCache: PropTypes.bool.isRequired, | 194 | isClearingAllCache: PropTypes.bool.isRequired, |
195 | onClearAllCache: PropTypes.func.isRequired, | 195 | onClearAllCache: PropTypes.func.isRequired, |
196 | getCacheSize: PropTypes.func.isRequired, | 196 | getCacheSize: PropTypes.func.isRequired, |
197 | isTodosEnabled: PropTypes.bool.isRequired, | ||
198 | isTodosActivated: PropTypes.bool.isRequired, | 197 | isTodosActivated: PropTypes.bool.isRequired, |
199 | isWorkspaceEnabled: PropTypes.bool.isRequired, | ||
200 | automaticUpdates: PropTypes.bool.isRequired, | 198 | automaticUpdates: PropTypes.bool.isRequired, |
201 | isDarkmodeEnabled: PropTypes.bool.isRequired, | 199 | isDarkmodeEnabled: PropTypes.bool.isRequired, |
202 | isAdaptableDarkModeEnabled: PropTypes.bool.isRequired, | 200 | isAdaptableDarkModeEnabled: PropTypes.bool.isRequired, |
@@ -244,8 +242,6 @@ class EditSettingsForm extends Component { | |||
244 | isClearingAllCache, | 242 | isClearingAllCache, |
245 | onClearAllCache, | 243 | onClearAllCache, |
246 | getCacheSize, | 244 | getCacheSize, |
247 | isTodosEnabled, | ||
248 | isWorkspaceEnabled, | ||
249 | automaticUpdates, | 245 | automaticUpdates, |
250 | isDarkmodeEnabled, | 246 | isDarkmodeEnabled, |
251 | isTodosActivated, | 247 | isTodosActivated, |
@@ -414,14 +410,12 @@ class EditSettingsForm extends Component { | |||
414 | 410 | ||
415 | <Hr /> | 411 | <Hr /> |
416 | 412 | ||
417 | {isWorkspaceEnabled && ( | 413 | <> |
418 | <> | 414 | <Toggle field={form.$('keepAllWorkspacesLoaded')} /> |
419 | <Toggle field={form.$('keepAllWorkspacesLoaded')} /> | 415 | <Hr /> |
420 | <Hr /> | 416 | </> |
421 | </> | ||
422 | )} | ||
423 | 417 | ||
424 | {isTodosEnabled && !hasAddedTodosAsService && ( | 418 | {!hasAddedTodosAsService && ( |
425 | <> | 419 | <> |
426 | <Toggle field={form.$('enableTodos')} /> | 420 | <Toggle field={form.$('enableTodos')} /> |
427 | {isTodosActivated && ( | 421 | {isTodosActivated && ( |