diff options
author | Markus Hatvan <markus_hatvan@aon.at> | 2021-12-04 10:51:16 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-04 10:51:16 +0100 |
commit | 11c992b04f3cad6badf0ae86da65f490e31dd359 (patch) | |
tree | 749e63f6ba3e9bea48c186b5d8502d328edfd276 /src/containers/settings | |
parent | 5.6.4-nightly.24 [skip ci] (diff) | |
download | ferdium-app-11c992b04f3cad6badf0ae86da65f490e31dd359.tar.gz ferdium-app-11c992b04f3cad6badf0ae86da65f490e31dd359.tar.zst ferdium-app-11c992b04f3cad6badf0ae86da65f490e31dd359.zip |
chore: upgrade react-jss to latest (#2302)
Diffstat (limited to 'src/containers/settings')
-rw-r--r-- | src/containers/settings/AccountScreen.js | 6 | ||||
-rw-r--r-- | src/containers/settings/EditServiceScreen.js | 8 | ||||
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 8 | ||||
-rw-r--r-- | src/containers/settings/EditUserScreen.js | 8 | ||||
-rw-r--r-- | src/containers/settings/InviteScreen.js | 6 | ||||
-rw-r--r-- | src/containers/settings/RecipesScreen.js | 6 | ||||
-rw-r--r-- | src/containers/settings/ServicesScreen.js | 6 | ||||
-rw-r--r-- | src/containers/settings/SettingsWindow.js | 6 | ||||
-rw-r--r-- | src/containers/settings/SupportScreen.js | 5 | ||||
-rw-r--r-- | src/containers/settings/TeamScreen.js | 6 |
10 files changed, 26 insertions, 39 deletions
diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js index f7c9b8164..aae230577 100644 --- a/src/containers/settings/AccountScreen.js +++ b/src/containers/settings/AccountScreen.js | |||
@@ -12,8 +12,6 @@ import ErrorBoundary from '../../components/util/ErrorBoundary'; | |||
12 | import { LIVE_FRANZ_API } from '../../config'; | 12 | import { LIVE_FRANZ_API } from '../../config'; |
13 | import { WEBSITE } from '../../environment-remote'; | 13 | import { WEBSITE } from '../../environment-remote'; |
14 | 14 | ||
15 | @inject('stores', 'actions') | ||
16 | @observer | ||
17 | class AccountScreen extends Component { | 15 | class AccountScreen extends Component { |
18 | onCloseWindow() { | 16 | onCloseWindow() { |
19 | const { user, features } = this.props.stores; | 17 | const { user, features } = this.props.stores; |
@@ -74,7 +72,7 @@ class AccountScreen extends Component { | |||
74 | } | 72 | } |
75 | } | 73 | } |
76 | 74 | ||
77 | AccountScreen.wrappedComponent.propTypes = { | 75 | AccountScreen.propTypes = { |
78 | stores: PropTypes.shape({ | 76 | stores: PropTypes.shape({ |
79 | user: PropTypes.instanceOf(UserStore).isRequired, | 77 | user: PropTypes.instanceOf(UserStore).isRequired, |
80 | features: PropTypes.instanceOf(FeaturesStore).isRequired, | 78 | features: PropTypes.instanceOf(FeaturesStore).isRequired, |
@@ -87,4 +85,4 @@ AccountScreen.wrappedComponent.propTypes = { | |||
87 | }).isRequired, | 85 | }).isRequired, |
88 | }; | 86 | }; |
89 | 87 | ||
90 | export default AccountScreen; | 88 | export default inject('stores', 'actions')(observer(AccountScreen)); |
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js index ddf7fab36..24b827993 100644 --- a/src/containers/settings/EditServiceScreen.js +++ b/src/containers/settings/EditServiceScreen.js | |||
@@ -111,8 +111,6 @@ const messages = defineMessages({ | |||
111 | }, | 111 | }, |
112 | }); | 112 | }); |
113 | 113 | ||
114 | @inject('stores', 'actions') | ||
115 | @observer | ||
116 | class EditServiceScreen extends Component { | 114 | class EditServiceScreen extends Component { |
117 | onSubmit(data) { | 115 | onSubmit(data) { |
118 | const { action } = this.props.router.params; | 116 | const { action } = this.props.router.params; |
@@ -438,7 +436,7 @@ class EditServiceScreen extends Component { | |||
438 | } | 436 | } |
439 | } | 437 | } |
440 | 438 | ||
441 | EditServiceScreen.wrappedComponent.propTypes = { | 439 | EditServiceScreen.propTypes = { |
442 | stores: PropTypes.shape({ | 440 | stores: PropTypes.shape({ |
443 | user: PropTypes.instanceOf(UserStore).isRequired, | 441 | user: PropTypes.instanceOf(UserStore).isRequired, |
444 | recipes: PropTypes.instanceOf(RecipesStore).isRequired, | 442 | recipes: PropTypes.instanceOf(RecipesStore).isRequired, |
@@ -451,4 +449,6 @@ EditServiceScreen.wrappedComponent.propTypes = { | |||
451 | }).isRequired, | 449 | }).isRequired, |
452 | }; | 450 | }; |
453 | 451 | ||
454 | export default injectIntl(EditServiceScreen); | 452 | export default injectIntl( |
453 | inject('stores', 'actions')(observer(EditServiceScreen)), | ||
454 | ); | ||
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 720f2c8a1..ddf6876b9 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js | |||
@@ -245,8 +245,6 @@ const messages = defineMessages({ | |||
245 | }, | 245 | }, |
246 | }); | 246 | }); |
247 | 247 | ||
248 | @inject('stores', 'actions') | ||
249 | @observer | ||
250 | class EditSettingsScreen extends Component { | 248 | class EditSettingsScreen extends Component { |
251 | constructor(props) { | 249 | constructor(props) { |
252 | super(props); | 250 | super(props); |
@@ -753,7 +751,7 @@ class EditSettingsScreen extends Component { | |||
753 | } | 751 | } |
754 | } | 752 | } |
755 | 753 | ||
756 | EditSettingsScreen.wrappedComponent.propTypes = { | 754 | EditSettingsScreen.propTypes = { |
757 | stores: PropTypes.shape({ | 755 | stores: PropTypes.shape({ |
758 | app: PropTypes.instanceOf(AppStore).isRequired, | 756 | app: PropTypes.instanceOf(AppStore).isRequired, |
759 | user: PropTypes.instanceOf(UserStore).isRequired, | 757 | user: PropTypes.instanceOf(UserStore).isRequired, |
@@ -771,4 +769,6 @@ EditSettingsScreen.wrappedComponent.propTypes = { | |||
771 | }).isRequired, | 769 | }).isRequired, |
772 | }; | 770 | }; |
773 | 771 | ||
774 | export default injectIntl(EditSettingsScreen); | 772 | export default injectIntl( |
773 | inject('stores', 'actions')(observer(EditSettingsScreen)), | ||
774 | ); | ||
diff --git a/src/containers/settings/EditUserScreen.js b/src/containers/settings/EditUserScreen.js index 1dc0aa8e6..baa2d7b71 100644 --- a/src/containers/settings/EditUserScreen.js +++ b/src/containers/settings/EditUserScreen.js | |||
@@ -49,8 +49,6 @@ const messages = defineMessages({ | |||
49 | }, | 49 | }, |
50 | }); | 50 | }); |
51 | 51 | ||
52 | @inject('stores', 'actions') | ||
53 | @observer | ||
54 | class EditUserScreen extends Component { | 52 | class EditUserScreen extends Component { |
55 | componentWillUnmount() { | 53 | componentWillUnmount() { |
56 | this.props.actions.user.resetStatus(); | 54 | this.props.actions.user.resetStatus(); |
@@ -150,7 +148,7 @@ class EditUserScreen extends Component { | |||
150 | } | 148 | } |
151 | } | 149 | } |
152 | 150 | ||
153 | EditUserScreen.wrappedComponent.propTypes = { | 151 | EditUserScreen.propTypes = { |
154 | stores: PropTypes.shape({ | 152 | stores: PropTypes.shape({ |
155 | user: PropTypes.instanceOf(UserStore).isRequired, | 153 | user: PropTypes.instanceOf(UserStore).isRequired, |
156 | }).isRequired, | 154 | }).isRequired, |
@@ -159,4 +157,6 @@ EditUserScreen.wrappedComponent.propTypes = { | |||
159 | }).isRequired, | 157 | }).isRequired, |
160 | }; | 158 | }; |
161 | 159 | ||
162 | export default injectIntl(EditUserScreen); | 160 | export default injectIntl( |
161 | inject('stores', 'actions')(observer(EditUserScreen)), | ||
162 | ); | ||
diff --git a/src/containers/settings/InviteScreen.js b/src/containers/settings/InviteScreen.js index 592b4b11c..86723554c 100644 --- a/src/containers/settings/InviteScreen.js +++ b/src/containers/settings/InviteScreen.js | |||
@@ -6,8 +6,6 @@ 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 | import UserStore from '../../stores/UserStore'; |
8 | 8 | ||
9 | @inject('stores', 'actions') | ||
10 | @observer | ||
11 | class InviteScreen extends Component { | 9 | class InviteScreen extends Component { |
12 | componentWillUnmount() { | 10 | componentWillUnmount() { |
13 | this.props.stores.user.inviteRequest.reset(); | 11 | this.props.stores.user.inviteRequest.reset(); |
@@ -32,7 +30,7 @@ class InviteScreen extends Component { | |||
32 | } | 30 | } |
33 | } | 31 | } |
34 | 32 | ||
35 | InviteScreen.wrappedComponent.propTypes = { | 33 | InviteScreen.propTypes = { |
36 | actions: PropTypes.shape({ | 34 | actions: PropTypes.shape({ |
37 | user: PropTypes.instanceOf(UserStore).isRequired, | 35 | user: PropTypes.instanceOf(UserStore).isRequired, |
38 | }).isRequired, | 36 | }).isRequired, |
@@ -41,4 +39,4 @@ InviteScreen.wrappedComponent.propTypes = { | |||
41 | }).isRequired, | 39 | }).isRequired, |
42 | }; | 40 | }; |
43 | 41 | ||
44 | export default InviteScreen; | 42 | export default inject('stores', 'actions')(observer(InviteScreen)); |
diff --git a/src/containers/settings/RecipesScreen.js b/src/containers/settings/RecipesScreen.js index 7f55e54c5..6b629d3d8 100644 --- a/src/containers/settings/RecipesScreen.js +++ b/src/containers/settings/RecipesScreen.js | |||
@@ -19,8 +19,6 @@ import RecipePreview from '../../models/RecipePreview'; | |||
19 | import AppStore from '../../stores/AppStore'; | 19 | import AppStore from '../../stores/AppStore'; |
20 | import { openPath } from '../../helpers/url-helpers'; | 20 | import { openPath } from '../../helpers/url-helpers'; |
21 | 21 | ||
22 | @inject('stores', 'actions') | ||
23 | @observer | ||
24 | class RecipesScreen extends Component { | 22 | class RecipesScreen extends Component { |
25 | static propTypes = { | 23 | static propTypes = { |
26 | params: PropTypes.shape({ | 24 | params: PropTypes.shape({ |
@@ -182,7 +180,7 @@ class RecipesScreen extends Component { | |||
182 | } | 180 | } |
183 | } | 181 | } |
184 | 182 | ||
185 | RecipesScreen.wrappedComponent.propTypes = { | 183 | RecipesScreen.propTypes = { |
186 | stores: PropTypes.shape({ | 184 | stores: PropTypes.shape({ |
187 | recipePreviews: PropTypes.instanceOf(RecipePreviewsStore).isRequired, | 185 | recipePreviews: PropTypes.instanceOf(RecipePreviewsStore).isRequired, |
188 | recipes: PropTypes.instanceOf(RecipeStore).isRequired, | 186 | recipes: PropTypes.instanceOf(RecipeStore).isRequired, |
@@ -198,4 +196,4 @@ RecipesScreen.wrappedComponent.propTypes = { | |||
198 | }).isRequired, | 196 | }).isRequired, |
199 | }; | 197 | }; |
200 | 198 | ||
201 | export default RecipesScreen; | 199 | export default inject('stores', 'actions')(observer(RecipesScreen)); |
diff --git a/src/containers/settings/ServicesScreen.js b/src/containers/settings/ServicesScreen.js index a657b6e6c..2970b2a54 100644 --- a/src/containers/settings/ServicesScreen.js +++ b/src/containers/settings/ServicesScreen.js | |||
@@ -10,8 +10,6 @@ import ServiceStore from '../../stores/ServicesStore'; | |||
10 | import ServicesDashboard from '../../components/settings/services/ServicesDashboard'; | 10 | import ServicesDashboard from '../../components/settings/services/ServicesDashboard'; |
11 | import ErrorBoundary from '../../components/util/ErrorBoundary'; | 11 | import ErrorBoundary from '../../components/util/ErrorBoundary'; |
12 | 12 | ||
13 | @inject('stores', 'actions') | ||
14 | @observer | ||
15 | class ServicesScreen extends Component { | 13 | class ServicesScreen extends Component { |
16 | componentWillUnmount() { | 14 | componentWillUnmount() { |
17 | this.props.actions.service.resetFilter(); | 15 | this.props.actions.service.resetFilter(); |
@@ -57,7 +55,7 @@ class ServicesScreen extends Component { | |||
57 | } | 55 | } |
58 | } | 56 | } |
59 | 57 | ||
60 | ServicesScreen.wrappedComponent.propTypes = { | 58 | ServicesScreen.propTypes = { |
61 | stores: PropTypes.shape({ | 59 | stores: PropTypes.shape({ |
62 | user: PropTypes.instanceOf(UserStore).isRequired, | 60 | user: PropTypes.instanceOf(UserStore).isRequired, |
63 | services: PropTypes.instanceOf(ServiceStore).isRequired, | 61 | services: PropTypes.instanceOf(ServiceStore).isRequired, |
@@ -68,4 +66,4 @@ ServicesScreen.wrappedComponent.propTypes = { | |||
68 | }).isRequired, | 66 | }).isRequired, |
69 | }; | 67 | }; |
70 | 68 | ||
71 | export default ServicesScreen; | 69 | export default inject('stores', 'actions')(observer(ServicesScreen)); |
diff --git a/src/containers/settings/SettingsWindow.js b/src/containers/settings/SettingsWindow.js index 35db3a434..0e6ce4df3 100644 --- a/src/containers/settings/SettingsWindow.js +++ b/src/containers/settings/SettingsWindow.js | |||
@@ -11,8 +11,6 @@ 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 | import UIStore from '../../stores/UIStore'; |
13 | 13 | ||
14 | @inject('stores', 'actions') | ||
15 | @observer | ||
16 | class SettingsContainer extends Component { | 14 | class SettingsContainer extends Component { |
17 | portalRoot = document.querySelector('#portalContainer'); | 15 | portalRoot = document.querySelector('#portalContainer'); |
18 | 16 | ||
@@ -48,7 +46,7 @@ class SettingsContainer extends Component { | |||
48 | } | 46 | } |
49 | } | 47 | } |
50 | 48 | ||
51 | SettingsContainer.wrappedComponent.propTypes = { | 49 | SettingsContainer.propTypes = { |
52 | children: PropTypes.element.isRequired, | 50 | children: PropTypes.element.isRequired, |
53 | stores: PropTypes.shape({ | 51 | stores: PropTypes.shape({ |
54 | services: PropTypes.instanceOf(ServicesStore).isRequired, | 52 | services: PropTypes.instanceOf(ServicesStore).isRequired, |
@@ -58,4 +56,4 @@ SettingsContainer.wrappedComponent.propTypes = { | |||
58 | }).isRequired, | 56 | }).isRequired, |
59 | }; | 57 | }; |
60 | 58 | ||
61 | export default SettingsContainer; | 59 | export default inject('stores', 'actions')(observer(SettingsContainer)); |
diff --git a/src/containers/settings/SupportScreen.js b/src/containers/settings/SupportScreen.js index d3600f8ea..b4ad952b2 100644 --- a/src/containers/settings/SupportScreen.js +++ b/src/containers/settings/SupportScreen.js | |||
@@ -6,7 +6,6 @@ import SupportFerdi from '../../components/settings/supportFerdi/SupportFerdiDas | |||
6 | import ErrorBoundary from '../../components/util/ErrorBoundary'; | 6 | import ErrorBoundary from '../../components/util/ErrorBoundary'; |
7 | import AppStore from '../../stores/AppStore'; | 7 | import AppStore from '../../stores/AppStore'; |
8 | 8 | ||
9 | @inject('actions') | ||
10 | class SupportScreen extends Component { | 9 | class SupportScreen extends Component { |
11 | constructor(props) { | 10 | constructor(props) { |
12 | super(props); | 11 | super(props); |
@@ -27,10 +26,10 @@ class SupportScreen extends Component { | |||
27 | } | 26 | } |
28 | } | 27 | } |
29 | 28 | ||
30 | SupportScreen.wrappedComponent.propTypes = { | 29 | SupportScreen.propTypes = { |
31 | actions: PropTypes.shape({ | 30 | actions: PropTypes.shape({ |
32 | app: PropTypes.instanceOf(AppStore).isRequired, | 31 | app: PropTypes.instanceOf(AppStore).isRequired, |
33 | }).isRequired, | 32 | }).isRequired, |
34 | }; | 33 | }; |
35 | 34 | ||
36 | export default SupportScreen; | 35 | export default inject('actions')(SupportScreen); |
diff --git a/src/containers/settings/TeamScreen.js b/src/containers/settings/TeamScreen.js index 928262a59..0a8b92b47 100644 --- a/src/containers/settings/TeamScreen.js +++ b/src/containers/settings/TeamScreen.js | |||
@@ -10,8 +10,6 @@ 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 | 12 | ||
13 | @inject('stores', 'actions') | ||
14 | @observer | ||
15 | class TeamScreen extends Component { | 13 | class TeamScreen extends Component { |
16 | handleWebsiteLink(route) { | 14 | handleWebsiteLink(route) { |
17 | const { actions, stores } = this.props; | 15 | const { actions, stores } = this.props; |
@@ -44,7 +42,7 @@ class TeamScreen extends Component { | |||
44 | } | 42 | } |
45 | } | 43 | } |
46 | 44 | ||
47 | TeamScreen.wrappedComponent.propTypes = { | 45 | TeamScreen.propTypes = { |
48 | stores: PropTypes.shape({ | 46 | stores: PropTypes.shape({ |
49 | user: PropTypes.instanceOf(UserStore).isRequired, | 47 | user: PropTypes.instanceOf(UserStore).isRequired, |
50 | app: PropTypes.instanceOf(AppStore).isRequired, | 48 | app: PropTypes.instanceOf(AppStore).isRequired, |
@@ -56,4 +54,4 @@ TeamScreen.wrappedComponent.propTypes = { | |||
56 | }).isRequired, | 54 | }).isRequired, |
57 | }; | 55 | }; |
58 | 56 | ||
59 | export default TeamScreen; | 57 | export default inject('stores', 'actions')(observer(TeamScreen)); |