aboutsummaryrefslogtreecommitdiffstats
path: root/src/containers
diff options
context:
space:
mode:
authorLibravatar Markus Hatvan <markus_hatvan@aon.at>2021-12-04 10:51:16 +0100
committerLibravatar GitHub <noreply@github.com>2021-12-04 10:51:16 +0100
commit11c992b04f3cad6badf0ae86da65f490e31dd359 (patch)
tree749e63f6ba3e9bea48c186b5d8502d328edfd276 /src/containers
parent5.6.4-nightly.24 [skip ci] (diff)
downloadferdium-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')
-rw-r--r--src/containers/auth/AuthLayoutContainer.js6
-rw-r--r--src/containers/auth/ChangeServerScreen.js6
-rw-r--r--src/containers/auth/ImportScreen.js6
-rw-r--r--src/containers/auth/InviteScreen.js6
-rw-r--r--src/containers/auth/LockedScreen.js6
-rw-r--r--src/containers/auth/LoginScreen.js6
-rw-r--r--src/containers/auth/PasswordScreen.js6
-rw-r--r--src/containers/auth/SetupAssistantScreen.js6
-rw-r--r--src/containers/auth/SignupScreen.js6
-rw-r--r--src/containers/auth/WelcomeScreen.js6
-rw-r--r--src/containers/layout/AppLayoutContainer.js6
-rw-r--r--src/containers/settings/AccountScreen.js6
-rw-r--r--src/containers/settings/EditServiceScreen.js8
-rw-r--r--src/containers/settings/EditSettingsScreen.js8
-rw-r--r--src/containers/settings/EditUserScreen.js8
-rw-r--r--src/containers/settings/InviteScreen.js6
-rw-r--r--src/containers/settings/RecipesScreen.js6
-rw-r--r--src/containers/settings/ServicesScreen.js6
-rw-r--r--src/containers/settings/SettingsWindow.js6
-rw-r--r--src/containers/settings/SupportScreen.js5
-rw-r--r--src/containers/settings/TeamScreen.js6
21 files changed, 48 insertions, 83 deletions
diff --git a/src/containers/auth/AuthLayoutContainer.js b/src/containers/auth/AuthLayoutContainer.js
index aa36e3969..e6d6dcf8a 100644
--- a/src/containers/auth/AuthLayoutContainer.js
+++ b/src/containers/auth/AuthLayoutContainer.js
@@ -14,8 +14,6 @@ import AppLoader from '../../components/ui/AppLoader';
14import { oneOrManyChildElements } from '../../prop-types'; 14import { oneOrManyChildElements } from '../../prop-types';
15import FeaturesStore from '../../stores/FeaturesStore'; 15import FeaturesStore from '../../stores/FeaturesStore';
16 16
17@inject('stores', 'actions')
18@observer
19class AuthLayoutContainer extends Component { 17class AuthLayoutContainer extends Component {
20 static propTypes = { 18 static propTypes = {
21 children: oneOrManyChildElements.isRequired, 19 children: oneOrManyChildElements.isRequired,
@@ -71,7 +69,7 @@ class AuthLayoutContainer extends Component {
71 } 69 }
72} 70}
73 71
74AuthLayoutContainer.wrappedComponent.propTypes = { 72AuthLayoutContainer.propTypes = {
75 stores: PropTypes.shape({ 73 stores: PropTypes.shape({
76 app: PropTypes.instanceOf(AppStore).isRequired, 74 app: PropTypes.instanceOf(AppStore).isRequired,
77 features: PropTypes.instanceOf(FeaturesStore).isRequired, 75 features: PropTypes.instanceOf(FeaturesStore).isRequired,
@@ -85,4 +83,4 @@ AuthLayoutContainer.wrappedComponent.propTypes = {
85 }).isRequired, 83 }).isRequired,
86}; 84};
87 85
88export default AuthLayoutContainer; 86export default inject('stores', 'actions')(observer(AuthLayoutContainer));
diff --git a/src/containers/auth/ChangeServerScreen.js b/src/containers/auth/ChangeServerScreen.js
index dcc913c39..60bfde088 100644
--- a/src/containers/auth/ChangeServerScreen.js
+++ b/src/containers/auth/ChangeServerScreen.js
@@ -5,8 +5,6 @@ import { RouterStore } from 'mobx-react-router';
5import ChangeServer from '../../components/auth/ChangeServer'; 5import ChangeServer from '../../components/auth/ChangeServer';
6import SettingsStore from '../../stores/SettingsStore'; 6import SettingsStore from '../../stores/SettingsStore';
7 7
8@inject('stores', 'actions')
9@observer
10class ChangeServerScreen extends Component { 8class ChangeServerScreen extends Component {
11 constructor(props) { 9 constructor(props) {
12 super(props); 10 super(props);
@@ -34,7 +32,7 @@ class ChangeServerScreen extends Component {
34 } 32 }
35} 33}
36 34
37ChangeServerScreen.wrappedComponent.propTypes = { 35ChangeServerScreen.propTypes = {
38 actions: PropTypes.shape({ 36 actions: PropTypes.shape({
39 settings: PropTypes.instanceOf(SettingsStore).isRequired, 37 settings: PropTypes.instanceOf(SettingsStore).isRequired,
40 }).isRequired, 38 }).isRequired,
@@ -44,4 +42,4 @@ ChangeServerScreen.wrappedComponent.propTypes = {
44 }).isRequired, 42 }).isRequired,
45}; 43};
46 44
47export default ChangeServerScreen; 45export default inject('stores', 'actions')(observer(ChangeServerScreen));
diff --git a/src/containers/auth/ImportScreen.js b/src/containers/auth/ImportScreen.js
index 46e2d41f0..c01c3d355 100644
--- a/src/containers/auth/ImportScreen.js
+++ b/src/containers/auth/ImportScreen.js
@@ -5,8 +5,6 @@ import { RouterStore } from 'mobx-react-router';
5import Import from '../../components/auth/Import'; 5import Import from '../../components/auth/Import';
6import UserStore from '../../stores/UserStore'; 6import UserStore from '../../stores/UserStore';
7 7
8@inject('stores', 'actions')
9@observer
10class ImportScreen extends Component { 8class ImportScreen extends Component {
11 render() { 9 render() {
12 const { actions, stores } = this.props; 10 const { actions, stores } = this.props;
@@ -26,7 +24,7 @@ class ImportScreen extends Component {
26 } 24 }
27} 25}
28 26
29ImportScreen.wrappedComponent.propTypes = { 27ImportScreen.propTypes = {
30 actions: PropTypes.shape({ 28 actions: PropTypes.shape({
31 user: PropTypes.instanceOf(UserStore).isRequired, 29 user: PropTypes.instanceOf(UserStore).isRequired,
32 }).isRequired, 30 }).isRequired,
@@ -36,4 +34,4 @@ ImportScreen.wrappedComponent.propTypes = {
36 }).isRequired, 34 }).isRequired,
37}; 35};
38 36
39export default ImportScreen; 37export default inject('stores', 'actions')(observer(ImportScreen));
diff --git a/src/containers/auth/InviteScreen.js b/src/containers/auth/InviteScreen.js
index e252242ae..fc66227cc 100644
--- a/src/containers/auth/InviteScreen.js
+++ b/src/containers/auth/InviteScreen.js
@@ -3,8 +3,6 @@ import PropTypes from 'prop-types';
3import { inject, observer } from 'mobx-react'; 3import { inject, observer } from 'mobx-react';
4import Invite from '../../components/auth/Invite'; 4import Invite from '../../components/auth/Invite';
5 5
6@inject('stores', 'actions')
7@observer
8class InviteScreen extends Component { 6class InviteScreen extends Component {
9 render() { 7 render() {
10 const { actions } = this.props; 8 const { actions } = this.props;
@@ -13,7 +11,7 @@ class InviteScreen extends Component {
13 } 11 }
14} 12}
15 13
16InviteScreen.wrappedComponent.propTypes = { 14InviteScreen.propTypes = {
17 actions: PropTypes.shape({ 15 actions: PropTypes.shape({
18 user: PropTypes.shape({ 16 user: PropTypes.shape({
19 invite: PropTypes.func.isRequired, 17 invite: PropTypes.func.isRequired,
@@ -21,4 +19,4 @@ InviteScreen.wrappedComponent.propTypes = {
21 }).isRequired, 19 }).isRequired,
22}; 20};
23 21
24export default InviteScreen; 22export default inject('stores', 'actions')(observer(InviteScreen));
diff --git a/src/containers/auth/LockedScreen.js b/src/containers/auth/LockedScreen.js
index 945e41284..87a00800f 100644
--- a/src/containers/auth/LockedScreen.js
+++ b/src/containers/auth/LockedScreen.js
@@ -7,8 +7,6 @@ import SettingsStore from '../../stores/SettingsStore';
7import { hash } from '../../helpers/password-helpers'; 7import { hash } from '../../helpers/password-helpers';
8import UserStore from '../../stores/UserStore'; 8import UserStore from '../../stores/UserStore';
9 9
10@inject('stores', 'actions')
11@observer
12class LockedScreen extends Component { 10class LockedScreen extends Component {
13 state = { 11 state = {
14 error: false, 12 error: false,
@@ -76,7 +74,7 @@ class LockedScreen extends Component {
76 } 74 }
77} 75}
78 76
79LockedScreen.wrappedComponent.propTypes = { 77LockedScreen.propTypes = {
80 actions: PropTypes.shape({ 78 actions: PropTypes.shape({
81 settings: PropTypes.instanceOf(SettingsStore).isRequired, 79 settings: PropTypes.instanceOf(SettingsStore).isRequired,
82 }).isRequired, 80 }).isRequired,
@@ -86,4 +84,4 @@ LockedScreen.wrappedComponent.propTypes = {
86 }).isRequired, 84 }).isRequired,
87}; 85};
88 86
89export default LockedScreen; 87export default inject('stores', 'actions')(observer(LockedScreen));
diff --git a/src/containers/auth/LoginScreen.js b/src/containers/auth/LoginScreen.js
index 3f8c67fa8..572a38ea1 100644
--- a/src/containers/auth/LoginScreen.js
+++ b/src/containers/auth/LoginScreen.js
@@ -6,8 +6,6 @@ import UserStore from '../../stores/UserStore';
6 6
7import { globalError as globalErrorPropType } from '../../prop-types'; 7import { globalError as globalErrorPropType } from '../../prop-types';
8 8
9@inject('stores', 'actions')
10@observer
11class LoginScreen extends Component { 9class LoginScreen extends Component {
12 static propTypes = { 10 static propTypes = {
13 error: globalErrorPropType.isRequired, 11 error: globalErrorPropType.isRequired,
@@ -32,7 +30,7 @@ class LoginScreen extends Component {
32 } 30 }
33} 31}
34 32
35LoginScreen.wrappedComponent.propTypes = { 33LoginScreen.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 @@ LoginScreen.wrappedComponent.propTypes = {
41 }).isRequired, 39 }).isRequired,
42}; 40};
43 41
44export default LoginScreen; 42export default inject('stores', 'actions')(observer(LoginScreen));
diff --git a/src/containers/auth/PasswordScreen.js b/src/containers/auth/PasswordScreen.js
index 836d4cc88..4b2c1b4a2 100644
--- a/src/containers/auth/PasswordScreen.js
+++ b/src/containers/auth/PasswordScreen.js
@@ -4,8 +4,6 @@ import { inject, observer } from 'mobx-react';
4import Password from '../../components/auth/Password'; 4import Password from '../../components/auth/Password';
5import UserStore from '../../stores/UserStore'; 5import UserStore from '../../stores/UserStore';
6 6
7@inject('stores', 'actions')
8@observer
9class PasswordScreen extends Component { 7class PasswordScreen extends Component {
10 render() { 8 render() {
11 const { actions, stores } = this.props; 9 const { actions, stores } = this.props;
@@ -22,7 +20,7 @@ class PasswordScreen extends Component {
22 } 20 }
23} 21}
24 22
25PasswordScreen.wrappedComponent.propTypes = { 23PasswordScreen.propTypes = {
26 actions: PropTypes.shape({ 24 actions: PropTypes.shape({
27 user: PropTypes.instanceOf(UserStore).isRequired, 25 user: PropTypes.instanceOf(UserStore).isRequired,
28 }).isRequired, 26 }).isRequired,
@@ -31,4 +29,4 @@ PasswordScreen.wrappedComponent.propTypes = {
31 }).isRequired, 29 }).isRequired,
32}; 30};
33 31
34export default PasswordScreen; 32export default inject('stores', 'actions')(observer(PasswordScreen));
diff --git a/src/containers/auth/SetupAssistantScreen.js b/src/containers/auth/SetupAssistantScreen.js
index 8cdd95a88..f6392712d 100644
--- a/src/containers/auth/SetupAssistantScreen.js
+++ b/src/containers/auth/SetupAssistantScreen.js
@@ -14,8 +14,6 @@ import ServicesStore from '../../stores/ServicesStore';
14import RecipesStore from '../../stores/RecipesStore'; 14import RecipesStore from '../../stores/RecipesStore';
15import UserStore from '../../stores/UserStore'; 15import UserStore from '../../stores/UserStore';
16 16
17@inject('stores', 'actions')
18@observer
19class SetupAssistantScreen extends Component { 17class SetupAssistantScreen extends Component {
20 constructor(props) { 18 constructor(props) {
21 super(props); 19 super(props);
@@ -120,7 +118,7 @@ class SetupAssistantScreen extends Component {
120 } 118 }
121} 119}
122 120
123SetupAssistantScreen.wrappedComponent.propTypes = { 121SetupAssistantScreen.propTypes = {
124 stores: PropTypes.shape({ 122 stores: PropTypes.shape({
125 services: PropTypes.instanceOf(ServicesStore), 123 services: PropTypes.instanceOf(ServicesStore),
126 router: PropTypes.instanceOf(RouterStore).isRequired, 124 router: PropTypes.instanceOf(RouterStore).isRequired,
@@ -134,4 +132,4 @@ SetupAssistantScreen.wrappedComponent.propTypes = {
134 }).isRequired, 132 }).isRequired,
135}; 133};
136 134
137export default SetupAssistantScreen; 135export default inject('stores', 'actions')(observer(SetupAssistantScreen));
diff --git a/src/containers/auth/SignupScreen.js b/src/containers/auth/SignupScreen.js
index 3b19f3c50..1dd8d0772 100644
--- a/src/containers/auth/SignupScreen.js
+++ b/src/containers/auth/SignupScreen.js
@@ -8,8 +8,6 @@ import FeaturesStore from '../../stores/FeaturesStore';
8 8
9import { globalError as globalErrorPropType } from '../../prop-types'; 9import { globalError as globalErrorPropType } from '../../prop-types';
10 10
11@inject('stores', 'actions')
12@observer
13class SignupScreen extends Component { 11class SignupScreen extends Component {
14 static propTypes = { 12 static propTypes = {
15 error: globalErrorPropType.isRequired, 13 error: globalErrorPropType.isRequired,
@@ -36,7 +34,7 @@ class SignupScreen extends Component {
36 } 34 }
37} 35}
38 36
39SignupScreen.wrappedComponent.propTypes = { 37SignupScreen.propTypes = {
40 actions: PropTypes.shape({ 38 actions: PropTypes.shape({
41 user: PropTypes.instanceOf(UserStore).isRequired, 39 user: PropTypes.instanceOf(UserStore).isRequired,
42 }).isRequired, 40 }).isRequired,
@@ -46,4 +44,4 @@ SignupScreen.wrappedComponent.propTypes = {
46 }).isRequired, 44 }).isRequired,
47}; 45};
48 46
49export default SignupScreen; 47export default inject('stores', 'actions')(observer(SignupScreen));
diff --git a/src/containers/auth/WelcomeScreen.js b/src/containers/auth/WelcomeScreen.js
index 7a23d9ba9..18b6b2eda 100644
--- a/src/containers/auth/WelcomeScreen.js
+++ b/src/containers/auth/WelcomeScreen.js
@@ -6,8 +6,6 @@ import Welcome from '../../components/auth/Welcome';
6import UserStore from '../../stores/UserStore'; 6import UserStore from '../../stores/UserStore';
7import RecipePreviewsStore from '../../stores/RecipePreviewsStore'; 7import RecipePreviewsStore from '../../stores/RecipePreviewsStore';
8 8
9@inject('stores', 'actions')
10@observer
11class LoginScreen extends Component { 9class LoginScreen extends Component {
12 render() { 10 render() {
13 const { user, recipePreviews } = this.props.stores; 11 const { user, recipePreviews } = this.props.stores;
@@ -23,11 +21,11 @@ class LoginScreen extends Component {
23 } 21 }
24} 22}
25 23
26LoginScreen.wrappedComponent.propTypes = { 24LoginScreen.propTypes = {
27 stores: PropTypes.shape({ 25 stores: PropTypes.shape({
28 user: PropTypes.instanceOf(UserStore).isRequired, 26 user: PropTypes.instanceOf(UserStore).isRequired,
29 recipePreviews: PropTypes.instanceOf(RecipePreviewsStore).isRequired, 27 recipePreviews: PropTypes.instanceOf(RecipePreviewsStore).isRequired,
30 }).isRequired, 28 }).isRequired,
31}; 29};
32 30
33export default LoginScreen; 31export default inject('stores', 'actions')(observer(LoginScreen));
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index 50a28803f..9b0edc85e 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -24,8 +24,6 @@ import WorkspaceDrawer from '../../features/workspaces/components/WorkspaceDrawe
24import { workspaceStore } from '../../features/workspaces'; 24import { workspaceStore } from '../../features/workspaces';
25import WorkspacesStore from '../../features/workspaces/store'; 25import WorkspacesStore from '../../features/workspaces/store';
26 26
27@inject('stores', 'actions')
28@observer
29class AppLayoutContainer extends Component { 27class AppLayoutContainer extends Component {
30 static defaultProps = { 28 static defaultProps = {
31 children: null, 29 children: null,
@@ -171,7 +169,7 @@ class AppLayoutContainer extends Component {
171 } 169 }
172} 170}
173 171
174AppLayoutContainer.wrappedComponent.propTypes = { 172AppLayoutContainer.propTypes = {
175 stores: PropTypes.shape({ 173 stores: PropTypes.shape({
176 services: PropTypes.instanceOf(ServicesStore).isRequired, 174 services: PropTypes.instanceOf(ServicesStore).isRequired,
177 features: PropTypes.instanceOf(FeaturesStore).isRequired, 175 features: PropTypes.instanceOf(FeaturesStore).isRequired,
@@ -194,4 +192,4 @@ AppLayoutContainer.wrappedComponent.propTypes = {
194 children: oneOrManyChildElements, 192 children: oneOrManyChildElements,
195}; 193};
196 194
197export default AppLayoutContainer; 195export default inject('stores', 'actions')(observer(AppLayoutContainer));
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';
12import { LIVE_FRANZ_API } from '../../config'; 12import { LIVE_FRANZ_API } from '../../config';
13import { WEBSITE } from '../../environment-remote'; 13import { WEBSITE } from '../../environment-remote';
14 14
15@inject('stores', 'actions')
16@observer
17class AccountScreen extends Component { 15class 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
77AccountScreen.wrappedComponent.propTypes = { 75AccountScreen.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
90export default AccountScreen; 88export 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
116class EditServiceScreen extends Component { 114class 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
441EditServiceScreen.wrappedComponent.propTypes = { 439EditServiceScreen.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
454export default injectIntl(EditServiceScreen); 452export 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
250class EditSettingsScreen extends Component { 248class 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
756EditSettingsScreen.wrappedComponent.propTypes = { 754EditSettingsScreen.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
774export default injectIntl(EditSettingsScreen); 772export 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
54class EditUserScreen extends Component { 52class 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
153EditUserScreen.wrappedComponent.propTypes = { 151EditUserScreen.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
162export default injectIntl(EditUserScreen); 160export 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';
6import ErrorBoundary from '../../components/util/ErrorBoundary'; 6import ErrorBoundary from '../../components/util/ErrorBoundary';
7import UserStore from '../../stores/UserStore'; 7import UserStore from '../../stores/UserStore';
8 8
9@inject('stores', 'actions')
10@observer
11class InviteScreen extends Component { 9class 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
35InviteScreen.wrappedComponent.propTypes = { 33InviteScreen.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
44export default InviteScreen; 42export 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';
19import AppStore from '../../stores/AppStore'; 19import AppStore from '../../stores/AppStore';
20import { openPath } from '../../helpers/url-helpers'; 20import { openPath } from '../../helpers/url-helpers';
21 21
22@inject('stores', 'actions')
23@observer
24class RecipesScreen extends Component { 22class 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
185RecipesScreen.wrappedComponent.propTypes = { 183RecipesScreen.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
201export default RecipesScreen; 199export 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';
10import ServicesDashboard from '../../components/settings/services/ServicesDashboard'; 10import ServicesDashboard from '../../components/settings/services/ServicesDashboard';
11import ErrorBoundary from '../../components/util/ErrorBoundary'; 11import ErrorBoundary from '../../components/util/ErrorBoundary';
12 12
13@inject('stores', 'actions')
14@observer
15class ServicesScreen extends Component { 13class 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
60ServicesScreen.wrappedComponent.propTypes = { 58ServicesScreen.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
71export default ServicesScreen; 69export 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';
11import { workspaceStore } from '../../features/workspaces'; 11import { workspaceStore } from '../../features/workspaces';
12import UIStore from '../../stores/UIStore'; 12import UIStore from '../../stores/UIStore';
13 13
14@inject('stores', 'actions')
15@observer
16class SettingsContainer extends Component { 14class 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
51SettingsContainer.wrappedComponent.propTypes = { 49SettingsContainer.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
61export default SettingsContainer; 59export 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
6import ErrorBoundary from '../../components/util/ErrorBoundary'; 6import ErrorBoundary from '../../components/util/ErrorBoundary';
7import AppStore from '../../stores/AppStore'; 7import AppStore from '../../stores/AppStore';
8 8
9@inject('actions')
10class SupportScreen extends Component { 9class 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
30SupportScreen.wrappedComponent.propTypes = { 29SupportScreen.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
36export default SupportScreen; 35export 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';
10import ErrorBoundary from '../../components/util/ErrorBoundary'; 10import ErrorBoundary from '../../components/util/ErrorBoundary';
11import { DEV_API_FRANZ_WEBSITE } from '../../config'; 11import { DEV_API_FRANZ_WEBSITE } from '../../config';
12 12
13@inject('stores', 'actions')
14@observer
15class TeamScreen extends Component { 13class 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
47TeamScreen.wrappedComponent.propTypes = { 45TeamScreen.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
59export default TeamScreen; 57export default inject('stores', 'actions')(observer(TeamScreen));
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-02 04:43:40 +0000