diff options
Diffstat (limited to 'src/containers/settings')
-rw-r--r-- | src/containers/settings/AccountScreen.js | 14 | ||||
-rw-r--r-- | src/containers/settings/EditServiceScreen.js | 17 | ||||
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 23 | ||||
-rw-r--r-- | src/containers/settings/EditUserScreen.js | 5 | ||||
-rw-r--r-- | src/containers/settings/InviteScreen.js | 9 | ||||
-rw-r--r-- | src/containers/settings/RecipesScreen.js | 10 | ||||
-rw-r--r-- | src/containers/settings/ServicesScreen.js | 9 | ||||
-rw-r--r-- | src/containers/settings/SettingsWindow.js | 5 | ||||
-rw-r--r-- | src/containers/settings/SupportScreen.js | 5 | ||||
-rw-r--r-- | src/containers/settings/TeamScreen.js | 14 |
10 files changed, 27 insertions, 84 deletions
diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js index 98e212192..2c9cac084 100644 --- a/src/containers/settings/AccountScreen.js +++ b/src/containers/settings/AccountScreen.js | |||
@@ -104,16 +104,8 @@ AccountScreen.wrappedComponent.propTypes = { | |||
104 | app: PropTypes.instanceOf(AppStore).isRequired, | 104 | app: PropTypes.instanceOf(AppStore).isRequired, |
105 | }).isRequired, | 105 | }).isRequired, |
106 | actions: PropTypes.shape({ | 106 | actions: PropTypes.shape({ |
107 | payment: PropTypes.shape({ | 107 | payment: PropTypes.instanceOf(PaymentStore).isRequired, |
108 | createDashboardUrl: PropTypes.func.isRequired, | 108 | app: PropTypes.instanceOf(AppStore).isRequired, |
109 | upgradeAccount: PropTypes.func.isRequired, | 109 | user: PropTypes.instanceOf(UserStore).isRequired, |
110 | }).isRequired, | ||
111 | app: PropTypes.shape({ | ||
112 | openExternalUrl: PropTypes.func.isRequired, | ||
113 | }).isRequired, | ||
114 | user: PropTypes.shape({ | ||
115 | update: PropTypes.func.isRequired, | ||
116 | delete: PropTypes.func.isRequired, | ||
117 | }).isRequired, | ||
118 | }).isRequired, | 110 | }).isRequired, |
119 | }; | 111 | }; |
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js index 77548bdcf..ddf2d2d25 100644 --- a/src/containers/settings/EditServiceScreen.js +++ b/src/containers/settings/EditServiceScreen.js | |||
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types'; | |||
3 | import { inject, observer } from 'mobx-react'; | 3 | import { inject, observer } from 'mobx-react'; |
4 | import { defineMessages, intlShape } from 'react-intl'; | 4 | import { defineMessages, intlShape } from 'react-intl'; |
5 | 5 | ||
6 | import { RouterStore } from 'mobx-react-router'; | ||
6 | import UserStore from '../../stores/UserStore'; | 7 | import UserStore from '../../stores/UserStore'; |
7 | import RecipesStore from '../../stores/RecipesStore'; | 8 | import RecipesStore from '../../stores/RecipesStore'; |
8 | import ServicesStore from '../../stores/ServicesStore'; | 9 | import ServicesStore from '../../stores/ServicesStore'; |
@@ -415,20 +416,8 @@ EditServiceScreen.wrappedComponent.propTypes = { | |||
415 | settings: PropTypes.instanceOf(SettingsStore).isRequired, | 416 | settings: PropTypes.instanceOf(SettingsStore).isRequired, |
416 | features: PropTypes.instanceOf(FeaturesStore).isRequired, | 417 | features: PropTypes.instanceOf(FeaturesStore).isRequired, |
417 | }).isRequired, | 418 | }).isRequired, |
418 | router: PropTypes.shape({ | 419 | router: PropTypes.instanceOf(RouterStore).isRequired, |
419 | params: PropTypes.shape({ | ||
420 | action: PropTypes.string.isRequired, | ||
421 | }).isRequired, | ||
422 | }).isRequired, | ||
423 | actions: PropTypes.shape({ | 420 | actions: PropTypes.shape({ |
424 | service: PropTypes.shape({ | 421 | service: PropTypes.instanceOf(ServicesStore).isRequired, |
425 | createService: PropTypes.func.isRequired, | ||
426 | updateService: PropTypes.func.isRequired, | ||
427 | deleteService: PropTypes.func.isRequired, | ||
428 | openRecipeFile: PropTypes.func.isRequired, | ||
429 | }).isRequired, | ||
430 | // settings: PropTypes.shape({ | ||
431 | // update: PropTypes.func.isRequred, | ||
432 | // }).isRequired, | ||
433 | }).isRequired, | 422 | }).isRequired, |
434 | }; | 423 | }; |
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 0a8258478..93c5daca2 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js | |||
@@ -679,23 +679,10 @@ EditSettingsScreen.wrappedComponent.propTypes = { | |||
679 | workspaces: PropTypes.instanceOf(WorkspacesStore).isRequired, | 679 | workspaces: PropTypes.instanceOf(WorkspacesStore).isRequired, |
680 | }).isRequired, | 680 | }).isRequired, |
681 | actions: PropTypes.shape({ | 681 | actions: PropTypes.shape({ |
682 | app: PropTypes.shape({ | 682 | app: PropTypes.instanceOf(AppStore).isRequired, |
683 | launchOnStartup: PropTypes.func.isRequired, | 683 | user: PropTypes.instanceOf(UserStore).isRequired, |
684 | checkForUpdates: PropTypes.func.isRequired, | 684 | settings: PropTypes.instanceOf(SettingsStore).isRequired, |
685 | installUpdate: PropTypes.func.isRequired, | 685 | todos: PropTypes.instanceOf(TodosStore).isRequired, |
686 | clearAllCache: PropTypes.func.isRequired, | 686 | workspaces: PropTypes.instanceOf(WorkspacesStore).isRequired, |
687 | }).isRequired, | ||
688 | settings: PropTypes.shape({ | ||
689 | update: PropTypes.func.isRequired, | ||
690 | }).isRequired, | ||
691 | user: PropTypes.shape({ | ||
692 | update: PropTypes.func.isRequired, | ||
693 | }).isRequired, | ||
694 | todos: PropTypes.shape({ | ||
695 | toggleTodosFeatureVisibility: PropTypes.func.isRequired, | ||
696 | }).isRequired, | ||
697 | workspaces: PropTypes.shape({ | ||
698 | toggleKeepAllWorkspacesLoadedSetting: PropTypes.func.isRequired, | ||
699 | }).isRequired, | ||
700 | }).isRequired, | 687 | }).isRequired, |
701 | }; | 688 | }; |
diff --git a/src/containers/settings/EditUserScreen.js b/src/containers/settings/EditUserScreen.js index 81f689400..8e93164de 100644 --- a/src/containers/settings/EditUserScreen.js +++ b/src/containers/settings/EditUserScreen.js | |||
@@ -153,9 +153,6 @@ EditUserScreen.wrappedComponent.propTypes = { | |||
153 | user: PropTypes.instanceOf(UserStore).isRequired, | 153 | user: PropTypes.instanceOf(UserStore).isRequired, |
154 | }).isRequired, | 154 | }).isRequired, |
155 | actions: PropTypes.shape({ | 155 | actions: PropTypes.shape({ |
156 | user: PropTypes.shape({ | 156 | user: PropTypes.instanceOf(UserStore).isRequired, |
157 | update: PropTypes.func.isRequired, | ||
158 | resetStatus: PropTypes.func.isRequired, | ||
159 | }).isRequired, | ||
160 | }).isRequired, | 157 | }).isRequired, |
161 | }; | 158 | }; |
diff --git a/src/containers/settings/InviteScreen.js b/src/containers/settings/InviteScreen.js index cc36849e8..4fdaef08b 100644 --- a/src/containers/settings/InviteScreen.js +++ b/src/containers/settings/InviteScreen.js | |||
@@ -4,6 +4,7 @@ import { inject, observer } from 'mobx-react'; | |||
4 | 4 | ||
5 | import Invite from '../../components/auth/Invite'; | 5 | import Invite from '../../components/auth/Invite'; |
6 | import ErrorBoundary from '../../components/util/ErrorBoundary'; | 6 | import ErrorBoundary from '../../components/util/ErrorBoundary'; |
7 | import UserStore from '../../stores/UserStore'; | ||
7 | 8 | ||
8 | export default @inject('stores', 'actions') @observer class InviteScreen extends Component { | 9 | export default @inject('stores', 'actions') @observer class InviteScreen extends Component { |
9 | componentWillUnmount() { | 10 | componentWillUnmount() { |
@@ -29,13 +30,9 @@ export default @inject('stores', 'actions') @observer class InviteScreen extends | |||
29 | 30 | ||
30 | InviteScreen.wrappedComponent.propTypes = { | 31 | InviteScreen.wrappedComponent.propTypes = { |
31 | actions: PropTypes.shape({ | 32 | actions: PropTypes.shape({ |
32 | user: PropTypes.shape({ | 33 | user: PropTypes.instanceOf(UserStore).isRequired, |
33 | invite: PropTypes.func.isRequired, | ||
34 | }).isRequired, | ||
35 | }).isRequired, | 34 | }).isRequired, |
36 | stores: PropTypes.shape({ | 35 | stores: PropTypes.shape({ |
37 | user: PropTypes.shape({ | 36 | user: PropTypes.instanceOf(UserStore).isRequired, |
38 | inviteRequest: PropTypes.object, | ||
39 | }).isRequired, | ||
40 | }).isRequired, | 37 | }).isRequired, |
41 | }; | 38 | }; |
diff --git a/src/containers/settings/RecipesScreen.js b/src/containers/settings/RecipesScreen.js index 74abcacee..72d551bc2 100644 --- a/src/containers/settings/RecipesScreen.js +++ b/src/containers/settings/RecipesScreen.js | |||
@@ -17,6 +17,7 @@ import ErrorBoundary from '../../components/util/ErrorBoundary'; | |||
17 | import { FRANZ_DEV_DOCS, RECIPES_PATH } from '../../config'; | 17 | import { FRANZ_DEV_DOCS, RECIPES_PATH } from '../../config'; |
18 | import { communityRecipesStore } from '../../features/communityRecipes'; | 18 | import { communityRecipesStore } from '../../features/communityRecipes'; |
19 | import RecipePreview from '../../models/RecipePreview'; | 19 | import RecipePreview from '../../models/RecipePreview'; |
20 | import AppStore from '../../stores/AppStore'; | ||
20 | 21 | ||
21 | export default @inject('stores', 'actions') @observer class RecipesScreen extends Component { | 22 | export default @inject('stores', 'actions') @observer class RecipesScreen extends Component { |
22 | static propTypes = { | 23 | static propTypes = { |
@@ -76,7 +77,6 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend | |||
76 | } | 77 | } |
77 | } | 78 | } |
78 | 79 | ||
79 | |||
80 | prepareRecipes(recipes) { | 80 | prepareRecipes(recipes) { |
81 | return recipes | 81 | return recipes |
82 | // Filter out duplicate recipes | 82 | // Filter out duplicate recipes |
@@ -186,12 +186,8 @@ RecipesScreen.wrappedComponent.propTypes = { | |||
186 | user: PropTypes.instanceOf(UserStore).isRequired, | 186 | user: PropTypes.instanceOf(UserStore).isRequired, |
187 | }).isRequired, | 187 | }).isRequired, |
188 | actions: PropTypes.shape({ | 188 | actions: PropTypes.shape({ |
189 | app: PropTypes.shape({ | 189 | app: PropTypes.instanceOf(AppStore).isRequired, |
190 | openExternalUrl: PropTypes.func.isRequired, | 190 | service: PropTypes.instanceOf(ServiceStore).isRequired, |
191 | }).isRequired, | ||
192 | service: PropTypes.shape({ | ||
193 | showAddServiceInterface: PropTypes.func.isRequired, | ||
194 | }).isRequired, | ||
195 | recipePreview: PropTypes.shape({ | 191 | recipePreview: PropTypes.shape({ |
196 | search: PropTypes.func.isRequired, | 192 | search: PropTypes.func.isRequired, |
197 | }).isRequired, | 193 | }).isRequired, |
diff --git a/src/containers/settings/ServicesScreen.js b/src/containers/settings/ServicesScreen.js index a501bf530..eb2b1bcb5 100644 --- a/src/containers/settings/ServicesScreen.js +++ b/src/containers/settings/ServicesScreen.js | |||
@@ -63,13 +63,6 @@ ServicesScreen.wrappedComponent.propTypes = { | |||
63 | router: PropTypes.instanceOf(RouterStore).isRequired, | 63 | router: PropTypes.instanceOf(RouterStore).isRequired, |
64 | }).isRequired, | 64 | }).isRequired, |
65 | actions: PropTypes.shape({ | 65 | actions: PropTypes.shape({ |
66 | service: PropTypes.shape({ | 66 | service: PropTypes.instanceOf(ServiceStore).isRequired, |
67 | showAddServiceInterface: PropTypes.func.isRequired, | ||
68 | deleteService: PropTypes.func.isRequired, | ||
69 | toggleService: PropTypes.func.isRequired, | ||
70 | filter: PropTypes.func.isRequired, | ||
71 | resetFilter: PropTypes.func.isRequired, | ||
72 | resetStatus: PropTypes.func.isRequired, | ||
73 | }).isRequired, | ||
74 | }).isRequired, | 67 | }).isRequired, |
75 | }; | 68 | }; |
diff --git a/src/containers/settings/SettingsWindow.js b/src/containers/settings/SettingsWindow.js index 440d32a46..89c2aaa27 100644 --- a/src/containers/settings/SettingsWindow.js +++ b/src/containers/settings/SettingsWindow.js | |||
@@ -9,6 +9,7 @@ import Layout from '../../components/settings/SettingsLayout'; | |||
9 | import Navigation from '../../components/settings/navigation/SettingsNavigation'; | 9 | import Navigation from '../../components/settings/navigation/SettingsNavigation'; |
10 | import ErrorBoundary from '../../components/util/ErrorBoundary'; | 10 | import ErrorBoundary from '../../components/util/ErrorBoundary'; |
11 | import { workspaceStore } from '../../features/workspaces'; | 11 | import { workspaceStore } from '../../features/workspaces'; |
12 | import UIStore from '../../stores/UIStore'; | ||
12 | 13 | ||
13 | export default @inject('stores', 'actions') @observer class SettingsContainer extends Component { | 14 | export default @inject('stores', 'actions') @observer class SettingsContainer extends Component { |
14 | portalRoot = document.querySelector('#portalContainer'); | 15 | portalRoot = document.querySelector('#portalContainer'); |
@@ -57,8 +58,6 @@ SettingsContainer.wrappedComponent.propTypes = { | |||
57 | services: PropTypes.instanceOf(ServicesStore).isRequired, | 58 | services: PropTypes.instanceOf(ServicesStore).isRequired, |
58 | }).isRequired, | 59 | }).isRequired, |
59 | actions: PropTypes.shape({ | 60 | actions: PropTypes.shape({ |
60 | ui: PropTypes.shape({ | 61 | ui: PropTypes.instanceOf(UIStore).isRequired, |
61 | closeSettings: PropTypes.func.isRequired, | ||
62 | }), | ||
63 | }).isRequired, | 62 | }).isRequired, |
64 | }; | 63 | }; |
diff --git a/src/containers/settings/SupportScreen.js b/src/containers/settings/SupportScreen.js index 34dce1dae..7d3b22f19 100644 --- a/src/containers/settings/SupportScreen.js +++ b/src/containers/settings/SupportScreen.js | |||
@@ -4,6 +4,7 @@ import PropTypes from 'prop-types'; | |||
4 | 4 | ||
5 | import SupportFerdi from '../../components/settings/supportFerdi/SupportFerdiDashboard'; | 5 | import SupportFerdi from '../../components/settings/supportFerdi/SupportFerdiDashboard'; |
6 | import ErrorBoundary from '../../components/util/ErrorBoundary'; | 6 | import ErrorBoundary from '../../components/util/ErrorBoundary'; |
7 | import AppStore from '../../stores/AppStore'; | ||
7 | 8 | ||
8 | export default @inject('actions') class SupportScreen extends Component { | 9 | export default @inject('actions') class SupportScreen extends Component { |
9 | constructor(props) { | 10 | constructor(props) { |
@@ -29,8 +30,6 @@ export default @inject('actions') class SupportScreen extends Component { | |||
29 | 30 | ||
30 | SupportScreen.wrappedComponent.propTypes = { | 31 | SupportScreen.wrappedComponent.propTypes = { |
31 | actions: PropTypes.shape({ | 32 | actions: PropTypes.shape({ |
32 | app: PropTypes.shape({ | 33 | app: PropTypes.instanceOf(AppStore).isRequired, |
33 | openExternalUrl: PropTypes.func.isRequired, | ||
34 | }).isRequired, | ||
35 | }).isRequired, | 34 | }).isRequired, |
36 | }; | 35 | }; |
diff --git a/src/containers/settings/TeamScreen.js b/src/containers/settings/TeamScreen.js index c1360a666..a627a047a 100644 --- a/src/containers/settings/TeamScreen.js +++ b/src/containers/settings/TeamScreen.js | |||
@@ -9,6 +9,7 @@ import SettingsStore from '../../stores/SettingsStore'; | |||
9 | import TeamDashboard from '../../components/settings/team/TeamDashboard'; | 9 | import TeamDashboard from '../../components/settings/team/TeamDashboard'; |
10 | import ErrorBoundary from '../../components/util/ErrorBoundary'; | 10 | import ErrorBoundary from '../../components/util/ErrorBoundary'; |
11 | import { DEV_API_FRANZ_WEBSITE } from '../../config'; | 11 | import { DEV_API_FRANZ_WEBSITE } from '../../config'; |
12 | import PaymentStore from '../../stores/PaymentStore'; | ||
12 | 13 | ||
13 | export default @inject('stores', 'actions') @observer class TeamScreen extends Component { | 14 | export default @inject('stores', 'actions') @observer class TeamScreen extends Component { |
14 | handleWebsiteLink(route) { | 15 | handleWebsiteLink(route) { |
@@ -47,15 +48,8 @@ TeamScreen.wrappedComponent.propTypes = { | |||
47 | settings: PropTypes.instanceOf(SettingsStore).isRequired, | 48 | settings: PropTypes.instanceOf(SettingsStore).isRequired, |
48 | }).isRequired, | 49 | }).isRequired, |
49 | actions: PropTypes.shape({ | 50 | actions: PropTypes.shape({ |
50 | payment: PropTypes.shape({ | 51 | payment: PropTypes.instanceOf(PaymentStore).isRequired, |
51 | createDashboardUrl: PropTypes.func.isRequired, | 52 | app: PropTypes.instanceOf(AppStore).isRequired, |
52 | }).isRequired, | 53 | user: PropTypes.instanceOf(UserStore).isRequired, |
53 | app: PropTypes.shape({ | ||
54 | openExternalUrl: PropTypes.func.isRequired, | ||
55 | }).isRequired, | ||
56 | user: PropTypes.shape({ | ||
57 | update: PropTypes.func.isRequired, | ||
58 | delete: PropTypes.func.isRequired, | ||
59 | }).isRequired, | ||
60 | }).isRequired, | 54 | }).isRequired, |
61 | }; | 55 | }; |