diff options
author | Vijay A <vraravam@users.noreply.github.com> | 2021-10-27 07:25:26 +0530 |
---|---|---|
committer | Vijay A <vraravam@users.noreply.github.com> | 2021-10-27 07:25:26 +0530 |
commit | 477bdd76a7405ff10a5cfabdec00ee9ae02f2698 (patch) | |
tree | bfa8cfb70e6852b9f535ccfd9b05712269a70dc1 /src/containers | |
parent | Bumped up ferdi beta version to '5.6.3-beta.2' (diff) | |
parent | 5.6.3-nightly.44 [skip ci] (diff) | |
download | ferdium-app-477bdd76a7405ff10a5cfabdec00ee9ae02f2698.tar.gz ferdium-app-477bdd76a7405ff10a5cfabdec00ee9ae02f2698.tar.zst ferdium-app-477bdd76a7405ff10a5cfabdec00ee9ae02f2698.zip |
Merge branch 'nightly' into release
Diffstat (limited to 'src/containers')
-rw-r--r-- | src/containers/layout/AppLayoutContainer.js | 3 | ||||
-rw-r--r-- | src/containers/settings/EditServiceScreen.js | 4 | ||||
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 28 |
3 files changed, 21 insertions, 14 deletions
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js index 0d566525d..6b6f97e46 100644 --- a/src/containers/layout/AppLayoutContainer.js +++ b/src/containers/layout/AppLayoutContainer.js | |||
@@ -122,6 +122,9 @@ class AppLayoutContainer extends Component { | |||
122 | showMessageBadgeWhenMutedSetting={ | 122 | showMessageBadgeWhenMutedSetting={ |
123 | settings.all.app.showMessageBadgeWhenMuted | 123 | settings.all.app.showMessageBadgeWhenMuted |
124 | } | 124 | } |
125 | showServiceNameSetting={ | ||
126 | settings.all.app.showServiceName | ||
127 | } | ||
125 | showMessageBadgesEvenWhenMuted={ui.showMessageBadgesEvenWhenMuted} | 128 | showMessageBadgesEvenWhenMuted={ui.showMessageBadgesEvenWhenMuted} |
126 | isTodosServiceActive={services.isTodosServiceActive || false} | 129 | isTodosServiceActive={services.isTodosServiceActive || false} |
127 | /> | 130 | /> |
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js index b84c0d5bb..ddf7fab36 100644 --- a/src/containers/settings/EditServiceScreen.js +++ b/src/containers/settings/EditServiceScreen.js | |||
@@ -8,7 +8,6 @@ import UserStore from '../../stores/UserStore'; | |||
8 | import RecipesStore from '../../stores/RecipesStore'; | 8 | import RecipesStore from '../../stores/RecipesStore'; |
9 | import ServicesStore from '../../stores/ServicesStore'; | 9 | import ServicesStore from '../../stores/ServicesStore'; |
10 | import SettingsStore from '../../stores/SettingsStore'; | 10 | import SettingsStore from '../../stores/SettingsStore'; |
11 | import FeaturesStore from '../../stores/FeaturesStore'; | ||
12 | import Form from '../../lib/Form'; | 11 | import Form from '../../lib/Form'; |
13 | 12 | ||
14 | import ServiceError from '../../components/settings/services/ServiceError'; | 13 | import ServiceError from '../../components/settings/services/ServiceError'; |
@@ -267,7 +266,7 @@ class EditServiceScreen extends Component { | |||
267 | Object.assign(config.fields, { | 266 | Object.assign(config.fields, { |
268 | customUrl: { | 267 | customUrl: { |
269 | label: intl.formatMessage(messages.customUrl), | 268 | label: intl.formatMessage(messages.customUrl), |
270 | placeholder: 'https://', | 269 | placeholder: "'http://' or 'https://' or 'file:///'", |
271 | value: service.customUrl || recipe.serviceURL, | 270 | value: service.customUrl || recipe.serviceURL, |
272 | validators: [required, url], | 271 | validators: [required, url], |
273 | }, | 272 | }, |
@@ -445,7 +444,6 @@ EditServiceScreen.wrappedComponent.propTypes = { | |||
445 | recipes: PropTypes.instanceOf(RecipesStore).isRequired, | 444 | recipes: PropTypes.instanceOf(RecipesStore).isRequired, |
446 | services: PropTypes.instanceOf(ServicesStore).isRequired, | 445 | services: PropTypes.instanceOf(ServicesStore).isRequired, |
447 | settings: PropTypes.instanceOf(SettingsStore).isRequired, | 446 | settings: PropTypes.instanceOf(SettingsStore).isRequired, |
448 | features: PropTypes.instanceOf(FeaturesStore).isRequired, | ||
449 | }).isRequired, | 447 | }).isRequired, |
450 | router: PropTypes.instanceOf(RouterStore).isRequired, | 448 | router: PropTypes.instanceOf(RouterStore).isRequired, |
451 | actions: PropTypes.shape({ | 449 | actions: PropTypes.shape({ |
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index de0714870..64f5b2e01 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js | |||
@@ -197,6 +197,10 @@ const messages = defineMessages({ | |||
197 | id: 'settings.app.form.showDisabledServices', | 197 | id: 'settings.app.form.showDisabledServices', |
198 | defaultMessage: 'Display disabled services tabs', | 198 | defaultMessage: 'Display disabled services tabs', |
199 | }, | 199 | }, |
200 | showServiceName: { | ||
201 | id: 'settings.app.form.showServiceName', | ||
202 | defaultMessage: 'Display service name under the icon', | ||
203 | }, | ||
200 | showMessageBadgeWhenMuted: { | 204 | showMessageBadgeWhenMuted: { |
201 | id: 'settings.app.form.showMessagesBadgesWhenMuted', | 205 | id: 'settings.app.form.showMessagesBadgesWhenMuted', |
202 | defaultMessage: 'Show unread message badge when notifications are disabled', | 206 | defaultMessage: 'Show unread message badge when notifications are disabled', |
@@ -301,6 +305,7 @@ class EditSettingsScreen extends Component { | |||
301 | settingsData.enableGlobalHideShortcut, | 305 | settingsData.enableGlobalHideShortcut, |
302 | ), | 306 | ), |
303 | showDisabledServices: Boolean(settingsData.showDisabledServices), | 307 | showDisabledServices: Boolean(settingsData.showDisabledServices), |
308 | showServiceName: Boolean(settingsData.showServiceName), | ||
304 | darkMode: Boolean(settingsData.darkMode), | 309 | darkMode: Boolean(settingsData.darkMode), |
305 | adaptableDarkMode: Boolean(settingsData.adaptableDarkMode), | 310 | adaptableDarkMode: Boolean(settingsData.adaptableDarkMode), |
306 | universalDarkMode: Boolean(settingsData.universalDarkMode), | 311 | universalDarkMode: Boolean(settingsData.universalDarkMode), |
@@ -334,14 +339,12 @@ class EditSettingsScreen extends Component { | |||
334 | }, | 339 | }, |
335 | }); | 340 | }); |
336 | 341 | ||
337 | if (workspaces.isFeatureActive) { | 342 | const { keepAllWorkspacesLoaded } = workspaces.settings; |
338 | const { keepAllWorkspacesLoaded } = workspaces.settings; | 343 | if ( |
339 | if ( | 344 | Boolean(keepAllWorkspacesLoaded) !== |
340 | Boolean(keepAllWorkspacesLoaded) !== | 345 | Boolean(settingsData.keepAllWorkspacesLoaded) |
341 | Boolean(settingsData.keepAllWorkspacesLoaded) | 346 | ) { |
342 | ) { | 347 | workspaceActions.toggleKeepAllWorkspacesLoadedSetting(); |
343 | workspaceActions.toggleKeepAllWorkspacesLoadedSetting(); | ||
344 | } | ||
345 | } | 348 | } |
346 | 349 | ||
347 | if (todos.isFeatureActive) { | 350 | if (todos.isFeatureActive) { |
@@ -558,6 +561,11 @@ class EditSettingsScreen extends Component { | |||
558 | value: settings.all.app.showDisabledServices, | 561 | value: settings.all.app.showDisabledServices, |
559 | default: DEFAULT_APP_SETTINGS.showDisabledServices, | 562 | default: DEFAULT_APP_SETTINGS.showDisabledServices, |
560 | }, | 563 | }, |
564 | showServiceName: { | ||
565 | label: intl.formatMessage(messages.showServiceName), | ||
566 | value: settings.all.app.showServiceName, | ||
567 | default: DEFAULT_APP_SETTINGS.showServiceName, | ||
568 | }, | ||
561 | showMessageBadgeWhenMuted: { | 569 | showMessageBadgeWhenMuted: { |
562 | label: intl.formatMessage(messages.showMessageBadgeWhenMuted), | 570 | label: intl.formatMessage(messages.showMessageBadgeWhenMuted), |
563 | value: settings.all.app.showMessageBadgeWhenMuted, | 571 | value: settings.all.app.showMessageBadgeWhenMuted, |
@@ -686,7 +694,7 @@ class EditSettingsScreen extends Component { | |||
686 | } | 694 | } |
687 | 695 | ||
688 | render() { | 696 | render() { |
689 | const { app, todos, workspaces, services } = this.props.stores; | 697 | const { app, services } = this.props.stores; |
690 | const { | 698 | const { |
691 | updateStatus, | 699 | updateStatus, |
692 | updateStatusTypes, | 700 | updateStatusTypes, |
@@ -711,8 +719,6 @@ class EditSettingsScreen extends Component { | |||
711 | getCacheSize={() => app.cacheSize} | 719 | getCacheSize={() => app.cacheSize} |
712 | isClearingAllCache={isClearingAllCache} | 720 | isClearingAllCache={isClearingAllCache} |
713 | onClearAllCache={clearAllCache} | 721 | onClearAllCache={clearAllCache} |
714 | isTodosEnabled={todos.isFeatureActive} | ||
715 | isWorkspaceEnabled={workspaces.isFeatureActive} | ||
716 | lockingFeatureEnabled={lockingFeatureEnabled} | 722 | lockingFeatureEnabled={lockingFeatureEnabled} |
717 | automaticUpdates={this.props.stores.settings.app.automaticUpdates} | 723 | automaticUpdates={this.props.stores.settings.app.automaticUpdates} |
718 | isDarkmodeEnabled={this.props.stores.settings.app.darkMode} | 724 | isDarkmodeEnabled={this.props.stores.settings.app.darkMode} |