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/components/settings/SettingsLayout.js | 3 +-- .../settings/account/AccountDashboard.js | 3 +-- .../settings/navigation/SettingsNavigation.js | 4 +--- src/components/settings/recipes/RecipeItem.js | 3 +-- .../settings/recipes/RecipesDashboard.js | 28 ++++++++++++---------- .../settings/services/EditServiceForm.js | 3 +-- src/components/settings/services/ServiceError.js | 3 +-- src/components/settings/services/ServiceItem.js | 3 +-- .../settings/services/ServicesDashboard.js | 3 +-- .../settings/settings/EditSettingsForm.js | 3 +-- src/components/settings/team/TeamDashboard.js | 6 ++--- src/components/settings/user/EditUserForm.js | 3 +-- 12 files changed, 28 insertions(+), 37 deletions(-) (limited to 'src/components/settings') diff --git a/src/components/settings/SettingsLayout.js b/src/components/settings/SettingsLayout.js index e9119a944..de13e95ab 100644 --- a/src/components/settings/SettingsLayout.js +++ b/src/components/settings/SettingsLayout.js @@ -16,7 +16,6 @@ const messages = defineMessages({ }, }); -@observer class SettingsLayout extends Component { static propTypes = { navigation: PropTypes.element.isRequired, @@ -78,4 +77,4 @@ class SettingsLayout extends Component { } } -export default injectIntl(SettingsLayout); +export default injectIntl(observer(SettingsLayout)); diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js index 6c489e64b..d0c56af05 100644 --- a/src/components/settings/account/AccountDashboard.js +++ b/src/components/settings/account/AccountDashboard.js @@ -64,7 +64,6 @@ const messages = defineMessages({ }, }); -@observer class AccountDashboard extends Component { static propTypes = { user: MobxPropTypes.observableObject.isRequired, @@ -229,4 +228,4 @@ class AccountDashboard extends Component { } } -export default injectIntl(AccountDashboard); +export default injectIntl(observer(AccountDashboard)); diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js index dbb1365b0..2fdb6e574 100644 --- a/src/components/settings/navigation/SettingsNavigation.js +++ b/src/components/settings/navigation/SettingsNavigation.js @@ -42,8 +42,6 @@ const messages = defineMessages({ }, }); -@inject('stores', 'actions') -@observer class SettingsNavigation extends Component { static propTypes = { stores: PropTypes.shape({ @@ -175,4 +173,4 @@ class SettingsNavigation extends Component { } } -export default injectIntl(SettingsNavigation); +export default injectIntl(inject('stores', 'actions')(observer(SettingsNavigation))); diff --git a/src/components/settings/recipes/RecipeItem.js b/src/components/settings/recipes/RecipeItem.js index 1e910e6dc..df5b42222 100644 --- a/src/components/settings/recipes/RecipeItem.js +++ b/src/components/settings/recipes/RecipeItem.js @@ -4,7 +4,6 @@ import { observer } from 'mobx-react'; import RecipePreviewModel from '../../../models/RecipePreview'; -@observer class RecipeItem extends Component { static propTypes = { recipe: PropTypes.instanceOf(RecipePreviewModel).isRequired, @@ -31,4 +30,4 @@ class RecipeItem extends Component { } } -export default RecipeItem; +export default observer(RecipeItem); diff --git a/src/components/settings/recipes/RecipesDashboard.js b/src/components/settings/recipes/RecipesDashboard.js index 7ec285431..d9f53d74e 100644 --- a/src/components/settings/recipes/RecipesDashboard.js +++ b/src/components/settings/recipes/RecipesDashboard.js @@ -105,8 +105,6 @@ const styles = { }, }; -@injectSheet(styles) -@observer class RecipesDashboard extends Component { static propTypes = { recipes: MobxPropTypes.arrayOrObservableArray.isRequired, @@ -247,16 +245,18 @@ class RecipesDashboard extends Component { {intl.formatMessage(messages.nothingFound)}

- - isLoggedIn && - showAddServiceInterface({ - recipeId: customWebsiteRecipe.id, - }) - } - /> + {customWebsiteRecipe && customWebsiteRecipe.id && ( + + isLoggedIn && + showAddServiceInterface({ + recipeId: customWebsiteRecipe.id, + }) + } + /> + )} )} {communityRecipes.map(recipe => ( @@ -295,4 +295,6 @@ class RecipesDashboard extends Component { } } -export default injectIntl(RecipesDashboard); +export default injectIntl( + injectSheet(styles, { injectTheme: true })(observer(RecipesDashboard)), +); diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js index 6b4cc721d..f0e791b87 100644 --- a/src/components/settings/services/EditServiceForm.js +++ b/src/components/settings/services/EditServiceForm.js @@ -134,7 +134,6 @@ const messages = defineMessages({ }, }); -@observer class EditServiceForm extends Component { static propTypes = { recipe: PropTypes.instanceOf(Recipe).isRequired, @@ -500,4 +499,4 @@ class EditServiceForm extends Component { } } -export default injectIntl(EditServiceForm); +export default injectIntl(observer(EditServiceForm)); diff --git a/src/components/settings/services/ServiceError.js b/src/components/settings/services/ServiceError.js index 6dd53a102..bcbbca3de 100644 --- a/src/components/settings/services/ServiceError.js +++ b/src/components/settings/services/ServiceError.js @@ -25,7 +25,6 @@ const messages = defineMessages({ }, }); -@observer class ServiceError extends Component { render() { const { intl } = this.props; @@ -60,4 +59,4 @@ class ServiceError extends Component { } } -export default injectIntl(ServiceError); +export default injectIntl(observer(ServiceError)); diff --git a/src/components/settings/services/ServiceItem.js b/src/components/settings/services/ServiceItem.js index d83e5fd56..23250ad09 100644 --- a/src/components/settings/services/ServiceItem.js +++ b/src/components/settings/services/ServiceItem.js @@ -24,7 +24,6 @@ const messages = defineMessages({ }, }); -@observer class ServiceItem extends Component { static propTypes = { service: PropTypes.instanceOf(ServiceModel).isRequired, @@ -91,4 +90,4 @@ class ServiceItem extends Component { } } -export default injectIntl(ServiceItem); +export default injectIntl(observer(ServiceItem)); diff --git a/src/components/settings/services/ServicesDashboard.js b/src/components/settings/services/ServicesDashboard.js index aae6eb855..81c5faa70 100644 --- a/src/components/settings/services/ServicesDashboard.js +++ b/src/components/settings/services/ServicesDashboard.js @@ -51,7 +51,6 @@ const messages = defineMessages({ }, }); -@observer class ServicesDashboard extends Component { static propTypes = { services: MobxPropTypes.arrayOrObservableArray.isRequired, @@ -188,4 +187,4 @@ class ServicesDashboard extends Component { } } -export default injectIntl(ServicesDashboard); +export default injectIntl(observer(ServicesDashboard)); diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 9f51b54d5..d9df9c41c 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js @@ -188,7 +188,6 @@ const messages = defineMessages({ const Hr = () =>
; -@observer class EditSettingsForm extends Component { static propTypes = { checkForUpdates: PropTypes.func.isRequired, @@ -847,4 +846,4 @@ class EditSettingsForm extends Component { } } -export default injectIntl(EditSettingsForm); +export default injectIntl(observer(EditSettingsForm)); diff --git a/src/components/settings/team/TeamDashboard.js b/src/components/settings/team/TeamDashboard.js index 38d124266..802284051 100644 --- a/src/components/settings/team/TeamDashboard.js +++ b/src/components/settings/team/TeamDashboard.js @@ -90,8 +90,6 @@ const styles = { }, }; -@injectSheet(styles) -@observer class TeamDashboard extends Component { static propTypes = { isLoading: PropTypes.bool.isRequired, @@ -197,4 +195,6 @@ class TeamDashboard extends Component { } } -export default injectIntl(TeamDashboard); +export default injectIntl( + injectSheet(styles, { injectTheme: true })(observer(TeamDashboard)), +); diff --git a/src/components/settings/user/EditUserForm.js b/src/components/settings/user/EditUserForm.js index 1b8a4f25a..95498d9bb 100644 --- a/src/components/settings/user/EditUserForm.js +++ b/src/components/settings/user/EditUserForm.js @@ -37,7 +37,6 @@ const messages = defineMessages({ }, }); -@observer class EditUserForm extends Component { static propTypes = { status: MobxPropTypes.observableArray.isRequired, @@ -128,4 +127,4 @@ class EditUserForm extends Component { } } -export default injectIntl(EditUserForm); +export default injectIntl(observer(EditUserForm)); -- cgit v1.2.3-70-g09d2