From 11c992b04f3cad6badf0ae86da65f490e31dd359 Mon Sep 17 00:00:00 2001 From: Markus Hatvan Date: Sat, 4 Dec 2021 10:51:16 +0100 Subject: chore: upgrade react-jss to latest (#2302) --- src/containers/auth/AuthLayoutContainer.js | 6 ++---- src/containers/auth/ChangeServerScreen.js | 6 ++---- src/containers/auth/ImportScreen.js | 6 ++---- src/containers/auth/InviteScreen.js | 6 ++---- src/containers/auth/LockedScreen.js | 6 ++---- src/containers/auth/LoginScreen.js | 6 ++---- src/containers/auth/PasswordScreen.js | 6 ++---- src/containers/auth/SetupAssistantScreen.js | 6 ++---- src/containers/auth/SignupScreen.js | 6 ++---- src/containers/auth/WelcomeScreen.js | 6 ++---- src/containers/layout/AppLayoutContainer.js | 6 ++---- src/containers/settings/AccountScreen.js | 6 ++---- src/containers/settings/EditServiceScreen.js | 8 ++++---- src/containers/settings/EditSettingsScreen.js | 8 ++++---- src/containers/settings/EditUserScreen.js | 8 ++++---- src/containers/settings/InviteScreen.js | 6 ++---- src/containers/settings/RecipesScreen.js | 6 ++---- src/containers/settings/ServicesScreen.js | 6 ++---- src/containers/settings/SettingsWindow.js | 6 ++---- src/containers/settings/SupportScreen.js | 5 ++--- src/containers/settings/TeamScreen.js | 6 ++---- 21 files changed, 48 insertions(+), 83 deletions(-) (limited to 'src/containers') 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'; import { oneOrManyChildElements } from '../../prop-types'; import FeaturesStore from '../../stores/FeaturesStore'; -@inject('stores', 'actions') -@observer class AuthLayoutContainer extends Component { static propTypes = { children: oneOrManyChildElements.isRequired, @@ -71,7 +69,7 @@ class AuthLayoutContainer extends Component { } } -AuthLayoutContainer.wrappedComponent.propTypes = { +AuthLayoutContainer.propTypes = { stores: PropTypes.shape({ app: PropTypes.instanceOf(AppStore).isRequired, features: PropTypes.instanceOf(FeaturesStore).isRequired, @@ -85,4 +83,4 @@ AuthLayoutContainer.wrappedComponent.propTypes = { }).isRequired, }; -export default AuthLayoutContainer; +export 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'; import ChangeServer from '../../components/auth/ChangeServer'; import SettingsStore from '../../stores/SettingsStore'; -@inject('stores', 'actions') -@observer class ChangeServerScreen extends Component { constructor(props) { super(props); @@ -34,7 +32,7 @@ class ChangeServerScreen extends Component { } } -ChangeServerScreen.wrappedComponent.propTypes = { +ChangeServerScreen.propTypes = { actions: PropTypes.shape({ settings: PropTypes.instanceOf(SettingsStore).isRequired, }).isRequired, @@ -44,4 +42,4 @@ ChangeServerScreen.wrappedComponent.propTypes = { }).isRequired, }; -export default ChangeServerScreen; +export 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'; import Import from '../../components/auth/Import'; import UserStore from '../../stores/UserStore'; -@inject('stores', 'actions') -@observer class ImportScreen extends Component { render() { const { actions, stores } = this.props; @@ -26,7 +24,7 @@ class ImportScreen extends Component { } } -ImportScreen.wrappedComponent.propTypes = { +ImportScreen.propTypes = { actions: PropTypes.shape({ user: PropTypes.instanceOf(UserStore).isRequired, }).isRequired, @@ -36,4 +34,4 @@ ImportScreen.wrappedComponent.propTypes = { }).isRequired, }; -export default ImportScreen; +export 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'; import { inject, observer } from 'mobx-react'; import Invite from '../../components/auth/Invite'; -@inject('stores', 'actions') -@observer class InviteScreen extends Component { render() { const { actions } = this.props; @@ -13,7 +11,7 @@ class InviteScreen extends Component { } } -InviteScreen.wrappedComponent.propTypes = { +InviteScreen.propTypes = { actions: PropTypes.shape({ user: PropTypes.shape({ invite: PropTypes.func.isRequired, @@ -21,4 +19,4 @@ InviteScreen.wrappedComponent.propTypes = { }).isRequired, }; -export default InviteScreen; +export 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'; import { hash } from '../../helpers/password-helpers'; import UserStore from '../../stores/UserStore'; -@inject('stores', 'actions') -@observer class LockedScreen extends Component { state = { error: false, @@ -76,7 +74,7 @@ class LockedScreen extends Component { } } -LockedScreen.wrappedComponent.propTypes = { +LockedScreen.propTypes = { actions: PropTypes.shape({ settings: PropTypes.instanceOf(SettingsStore).isRequired, }).isRequired, @@ -86,4 +84,4 @@ LockedScreen.wrappedComponent.propTypes = { }).isRequired, }; -export default LockedScreen; +export 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'; import { globalError as globalErrorPropType } from '../../prop-types'; -@inject('stores', 'actions') -@observer class LoginScreen extends Component { static propTypes = { error: globalErrorPropType.isRequired, @@ -32,7 +30,7 @@ class LoginScreen extends Component { } } -LoginScreen.wrappedComponent.propTypes = { +LoginScreen.propTypes = { actions: PropTypes.shape({ user: PropTypes.instanceOf(UserStore).isRequired, }).isRequired, @@ -41,4 +39,4 @@ LoginScreen.wrappedComponent.propTypes = { }).isRequired, }; -export default LoginScreen; +export 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'; import Password from '../../components/auth/Password'; import UserStore from '../../stores/UserStore'; -@inject('stores', 'actions') -@observer class PasswordScreen extends Component { render() { const { actions, stores } = this.props; @@ -22,7 +20,7 @@ class PasswordScreen extends Component { } } -PasswordScreen.wrappedComponent.propTypes = { +PasswordScreen.propTypes = { actions: PropTypes.shape({ user: PropTypes.instanceOf(UserStore).isRequired, }).isRequired, @@ -31,4 +29,4 @@ PasswordScreen.wrappedComponent.propTypes = { }).isRequired, }; -export default PasswordScreen; +export 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'; import RecipesStore from '../../stores/RecipesStore'; import UserStore from '../../stores/UserStore'; -@inject('stores', 'actions') -@observer class SetupAssistantScreen extends Component { constructor(props) { super(props); @@ -120,7 +118,7 @@ class SetupAssistantScreen extends Component { } } -SetupAssistantScreen.wrappedComponent.propTypes = { +SetupAssistantScreen.propTypes = { stores: PropTypes.shape({ services: PropTypes.instanceOf(ServicesStore), router: PropTypes.instanceOf(RouterStore).isRequired, @@ -134,4 +132,4 @@ SetupAssistantScreen.wrappedComponent.propTypes = { }).isRequired, }; -export default SetupAssistantScreen; +export 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'; import { globalError as globalErrorPropType } from '../../prop-types'; -@inject('stores', 'actions') -@observer class SignupScreen extends Component { static propTypes = { error: globalErrorPropType.isRequired, @@ -36,7 +34,7 @@ class SignupScreen extends Component { } } -SignupScreen.wrappedComponent.propTypes = { +SignupScreen.propTypes = { actions: PropTypes.shape({ user: PropTypes.instanceOf(UserStore).isRequired, }).isRequired, @@ -46,4 +44,4 @@ SignupScreen.wrappedComponent.propTypes = { }).isRequired, }; -export default SignupScreen; +export 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'; import UserStore from '../../stores/UserStore'; import RecipePreviewsStore from '../../stores/RecipePreviewsStore'; -@inject('stores', 'actions') -@observer class LoginScreen extends Component { render() { const { user, recipePreviews } = this.props.stores; @@ -23,11 +21,11 @@ class LoginScreen extends Component { } } -LoginScreen.wrappedComponent.propTypes = { +LoginScreen.propTypes = { stores: PropTypes.shape({ user: PropTypes.instanceOf(UserStore).isRequired, recipePreviews: PropTypes.instanceOf(RecipePreviewsStore).isRequired, }).isRequired, }; -export default LoginScreen; +export 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 import { workspaceStore } from '../../features/workspaces'; import WorkspacesStore from '../../features/workspaces/store'; -@inject('stores', 'actions') -@observer class AppLayoutContainer extends Component { static defaultProps = { children: null, @@ -171,7 +169,7 @@ class AppLayoutContainer extends Component { } } -AppLayoutContainer.wrappedComponent.propTypes = { +AppLayoutContainer.propTypes = { stores: PropTypes.shape({ services: PropTypes.instanceOf(ServicesStore).isRequired, features: PropTypes.instanceOf(FeaturesStore).isRequired, @@ -194,4 +192,4 @@ AppLayoutContainer.wrappedComponent.propTypes = { children: oneOrManyChildElements, }; -export default AppLayoutContainer; +export 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'; import { LIVE_FRANZ_API } from '../../config'; import { WEBSITE } from '../../environment-remote'; -@inject('stores', 'actions') -@observer class AccountScreen extends Component { onCloseWindow() { const { user, features } = this.props.stores; @@ -74,7 +72,7 @@ class AccountScreen extends Component { } } -AccountScreen.wrappedComponent.propTypes = { +AccountScreen.propTypes = { stores: PropTypes.shape({ user: PropTypes.instanceOf(UserStore).isRequired, features: PropTypes.instanceOf(FeaturesStore).isRequired, @@ -87,4 +85,4 @@ AccountScreen.wrappedComponent.propTypes = { }).isRequired, }; -export default AccountScreen; +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({ }, }); -@inject('stores', 'actions') -@observer class EditServiceScreen extends Component { onSubmit(data) { const { action } = this.props.router.params; @@ -438,7 +436,7 @@ class EditServiceScreen extends Component { } } -EditServiceScreen.wrappedComponent.propTypes = { +EditServiceScreen.propTypes = { stores: PropTypes.shape({ user: PropTypes.instanceOf(UserStore).isRequired, recipes: PropTypes.instanceOf(RecipesStore).isRequired, @@ -451,4 +449,6 @@ EditServiceScreen.wrappedComponent.propTypes = { }).isRequired, }; -export default injectIntl(EditServiceScreen); +export default injectIntl( + inject('stores', 'actions')(observer(EditServiceScreen)), +); 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({ }, }); -@inject('stores', 'actions') -@observer class EditSettingsScreen extends Component { constructor(props) { super(props); @@ -753,7 +751,7 @@ class EditSettingsScreen extends Component { } } -EditSettingsScreen.wrappedComponent.propTypes = { +EditSettingsScreen.propTypes = { stores: PropTypes.shape({ app: PropTypes.instanceOf(AppStore).isRequired, user: PropTypes.instanceOf(UserStore).isRequired, @@ -771,4 +769,6 @@ EditSettingsScreen.wrappedComponent.propTypes = { }).isRequired, }; -export default injectIntl(EditSettingsScreen); +export default injectIntl( + inject('stores', 'actions')(observer(EditSettingsScreen)), +); 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({ }, }); -@inject('stores', 'actions') -@observer class EditUserScreen extends Component { componentWillUnmount() { this.props.actions.user.resetStatus(); @@ -150,7 +148,7 @@ class EditUserScreen extends Component { } } -EditUserScreen.wrappedComponent.propTypes = { +EditUserScreen.propTypes = { stores: PropTypes.shape({ user: PropTypes.instanceOf(UserStore).isRequired, }).isRequired, @@ -159,4 +157,6 @@ EditUserScreen.wrappedComponent.propTypes = { }).isRequired, }; -export default injectIntl(EditUserScreen); +export default injectIntl( + inject('stores', 'actions')(observer(EditUserScreen)), +); 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'; import ErrorBoundary from '../../components/util/ErrorBoundary'; import UserStore from '../../stores/UserStore'; -@inject('stores', 'actions') -@observer class InviteScreen extends Component { componentWillUnmount() { this.props.stores.user.inviteRequest.reset(); @@ -32,7 +30,7 @@ class InviteScreen extends Component { } } -InviteScreen.wrappedComponent.propTypes = { +InviteScreen.propTypes = { actions: PropTypes.shape({ user: PropTypes.instanceOf(UserStore).isRequired, }).isRequired, @@ -41,4 +39,4 @@ InviteScreen.wrappedComponent.propTypes = { }).isRequired, }; -export default InviteScreen; +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'; import AppStore from '../../stores/AppStore'; import { openPath } from '../../helpers/url-helpers'; -@inject('stores', 'actions') -@observer class RecipesScreen extends Component { static propTypes = { params: PropTypes.shape({ @@ -182,7 +180,7 @@ class RecipesScreen extends Component { } } -RecipesScreen.wrappedComponent.propTypes = { +RecipesScreen.propTypes = { stores: PropTypes.shape({ recipePreviews: PropTypes.instanceOf(RecipePreviewsStore).isRequired, recipes: PropTypes.instanceOf(RecipeStore).isRequired, @@ -198,4 +196,4 @@ RecipesScreen.wrappedComponent.propTypes = { }).isRequired, }; -export default RecipesScreen; +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'; import ServicesDashboard from '../../components/settings/services/ServicesDashboard'; import ErrorBoundary from '../../components/util/ErrorBoundary'; -@inject('stores', 'actions') -@observer class ServicesScreen extends Component { componentWillUnmount() { this.props.actions.service.resetFilter(); @@ -57,7 +55,7 @@ class ServicesScreen extends Component { } } -ServicesScreen.wrappedComponent.propTypes = { +ServicesScreen.propTypes = { stores: PropTypes.shape({ user: PropTypes.instanceOf(UserStore).isRequired, services: PropTypes.instanceOf(ServiceStore).isRequired, @@ -68,4 +66,4 @@ ServicesScreen.wrappedComponent.propTypes = { }).isRequired, }; -export default ServicesScreen; +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'; import { workspaceStore } from '../../features/workspaces'; import UIStore from '../../stores/UIStore'; -@inject('stores', 'actions') -@observer class SettingsContainer extends Component { portalRoot = document.querySelector('#portalContainer'); @@ -48,7 +46,7 @@ class SettingsContainer extends Component { } } -SettingsContainer.wrappedComponent.propTypes = { +SettingsContainer.propTypes = { children: PropTypes.element.isRequired, stores: PropTypes.shape({ services: PropTypes.instanceOf(ServicesStore).isRequired, @@ -58,4 +56,4 @@ SettingsContainer.wrappedComponent.propTypes = { }).isRequired, }; -export default SettingsContainer; +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 import ErrorBoundary from '../../components/util/ErrorBoundary'; import AppStore from '../../stores/AppStore'; -@inject('actions') class SupportScreen extends Component { constructor(props) { super(props); @@ -27,10 +26,10 @@ class SupportScreen extends Component { } } -SupportScreen.wrappedComponent.propTypes = { +SupportScreen.propTypes = { actions: PropTypes.shape({ app: PropTypes.instanceOf(AppStore).isRequired, }).isRequired, }; -export default SupportScreen; +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'; import ErrorBoundary from '../../components/util/ErrorBoundary'; import { DEV_API_FRANZ_WEBSITE } from '../../config'; -@inject('stores', 'actions') -@observer class TeamScreen extends Component { handleWebsiteLink(route) { const { actions, stores } = this.props; @@ -44,7 +42,7 @@ class TeamScreen extends Component { } } -TeamScreen.wrappedComponent.propTypes = { +TeamScreen.propTypes = { stores: PropTypes.shape({ user: PropTypes.instanceOf(UserStore).isRequired, app: PropTypes.instanceOf(AppStore).isRequired, @@ -56,4 +54,4 @@ TeamScreen.wrappedComponent.propTypes = { }).isRequired, }; -export default TeamScreen; +export default inject('stores', 'actions')(observer(TeamScreen)); -- cgit v1.2.3-54-g00ecf