From 4d26ffd4805c234e4b0592ae5aa9254e8c3206fd Mon Sep 17 00:00:00 2001 From: Vijay Raghavan Aravamudhan Date: Wed, 23 Jun 2021 20:39:18 +0530 Subject: Upgraded eslint and fixed all the reported errors. (#1549) --- src/containers/settings/AccountScreen.js | 14 +++----------- src/containers/settings/EditServiceScreen.js | 17 +++-------------- src/containers/settings/EditSettingsScreen.js | 23 +++++------------------ src/containers/settings/EditUserScreen.js | 5 +---- src/containers/settings/InviteScreen.js | 9 +++------ src/containers/settings/RecipesScreen.js | 10 +++------- src/containers/settings/ServicesScreen.js | 9 +-------- src/containers/settings/SettingsWindow.js | 5 ++--- src/containers/settings/SupportScreen.js | 5 ++--- src/containers/settings/TeamScreen.js | 14 ++++---------- 10 files changed, 27 insertions(+), 84 deletions(-) (limited to 'src/containers/settings') 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 = { app: PropTypes.instanceOf(AppStore).isRequired, }).isRequired, actions: PropTypes.shape({ - payment: PropTypes.shape({ - createDashboardUrl: PropTypes.func.isRequired, - upgradeAccount: PropTypes.func.isRequired, - }).isRequired, - app: PropTypes.shape({ - openExternalUrl: PropTypes.func.isRequired, - }).isRequired, - user: PropTypes.shape({ - update: PropTypes.func.isRequired, - delete: PropTypes.func.isRequired, - }).isRequired, + payment: PropTypes.instanceOf(PaymentStore).isRequired, + app: PropTypes.instanceOf(AppStore).isRequired, + user: PropTypes.instanceOf(UserStore).isRequired, }).isRequired, }; 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'; import { inject, observer } from 'mobx-react'; import { defineMessages, intlShape } from 'react-intl'; +import { RouterStore } from 'mobx-react-router'; import UserStore from '../../stores/UserStore'; import RecipesStore from '../../stores/RecipesStore'; import ServicesStore from '../../stores/ServicesStore'; @@ -415,20 +416,8 @@ EditServiceScreen.wrappedComponent.propTypes = { settings: PropTypes.instanceOf(SettingsStore).isRequired, features: PropTypes.instanceOf(FeaturesStore).isRequired, }).isRequired, - router: PropTypes.shape({ - params: PropTypes.shape({ - action: PropTypes.string.isRequired, - }).isRequired, - }).isRequired, + router: PropTypes.instanceOf(RouterStore).isRequired, actions: PropTypes.shape({ - service: PropTypes.shape({ - createService: PropTypes.func.isRequired, - updateService: PropTypes.func.isRequired, - deleteService: PropTypes.func.isRequired, - openRecipeFile: PropTypes.func.isRequired, - }).isRequired, - // settings: PropTypes.shape({ - // update: PropTypes.func.isRequred, - // }).isRequired, + service: PropTypes.instanceOf(ServicesStore).isRequired, }).isRequired, }; 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 = { workspaces: PropTypes.instanceOf(WorkspacesStore).isRequired, }).isRequired, actions: PropTypes.shape({ - app: PropTypes.shape({ - launchOnStartup: PropTypes.func.isRequired, - checkForUpdates: PropTypes.func.isRequired, - installUpdate: PropTypes.func.isRequired, - clearAllCache: PropTypes.func.isRequired, - }).isRequired, - settings: PropTypes.shape({ - update: PropTypes.func.isRequired, - }).isRequired, - user: PropTypes.shape({ - update: PropTypes.func.isRequired, - }).isRequired, - todos: PropTypes.shape({ - toggleTodosFeatureVisibility: PropTypes.func.isRequired, - }).isRequired, - workspaces: PropTypes.shape({ - toggleKeepAllWorkspacesLoadedSetting: PropTypes.func.isRequired, - }).isRequired, + app: PropTypes.instanceOf(AppStore).isRequired, + user: PropTypes.instanceOf(UserStore).isRequired, + settings: PropTypes.instanceOf(SettingsStore).isRequired, + todos: PropTypes.instanceOf(TodosStore).isRequired, + workspaces: PropTypes.instanceOf(WorkspacesStore).isRequired, }).isRequired, }; 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 = { user: PropTypes.instanceOf(UserStore).isRequired, }).isRequired, actions: PropTypes.shape({ - user: PropTypes.shape({ - update: PropTypes.func.isRequired, - resetStatus: PropTypes.func.isRequired, - }).isRequired, + user: PropTypes.instanceOf(UserStore).isRequired, }).isRequired, }; 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'; import Invite from '../../components/auth/Invite'; import ErrorBoundary from '../../components/util/ErrorBoundary'; +import UserStore from '../../stores/UserStore'; export default @inject('stores', 'actions') @observer class InviteScreen extends Component { componentWillUnmount() { @@ -29,13 +30,9 @@ export default @inject('stores', 'actions') @observer class InviteScreen extends InviteScreen.wrappedComponent.propTypes = { actions: PropTypes.shape({ - user: PropTypes.shape({ - invite: PropTypes.func.isRequired, - }).isRequired, + user: PropTypes.instanceOf(UserStore).isRequired, }).isRequired, stores: PropTypes.shape({ - user: PropTypes.shape({ - inviteRequest: PropTypes.object, - }).isRequired, + user: PropTypes.instanceOf(UserStore).isRequired, }).isRequired, }; 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'; import { FRANZ_DEV_DOCS, RECIPES_PATH } from '../../config'; import { communityRecipesStore } from '../../features/communityRecipes'; import RecipePreview from '../../models/RecipePreview'; +import AppStore from '../../stores/AppStore'; export default @inject('stores', 'actions') @observer class RecipesScreen extends Component { static propTypes = { @@ -76,7 +77,6 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend } } - prepareRecipes(recipes) { return recipes // Filter out duplicate recipes @@ -186,12 +186,8 @@ RecipesScreen.wrappedComponent.propTypes = { user: PropTypes.instanceOf(UserStore).isRequired, }).isRequired, actions: PropTypes.shape({ - app: PropTypes.shape({ - openExternalUrl: PropTypes.func.isRequired, - }).isRequired, - service: PropTypes.shape({ - showAddServiceInterface: PropTypes.func.isRequired, - }).isRequired, + app: PropTypes.instanceOf(AppStore).isRequired, + service: PropTypes.instanceOf(ServiceStore).isRequired, recipePreview: PropTypes.shape({ search: PropTypes.func.isRequired, }).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 = { router: PropTypes.instanceOf(RouterStore).isRequired, }).isRequired, actions: PropTypes.shape({ - service: PropTypes.shape({ - showAddServiceInterface: PropTypes.func.isRequired, - deleteService: PropTypes.func.isRequired, - toggleService: PropTypes.func.isRequired, - filter: PropTypes.func.isRequired, - resetFilter: PropTypes.func.isRequired, - resetStatus: PropTypes.func.isRequired, - }).isRequired, + service: PropTypes.instanceOf(ServiceStore).isRequired, }).isRequired, }; 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'; import Navigation from '../../components/settings/navigation/SettingsNavigation'; import ErrorBoundary from '../../components/util/ErrorBoundary'; import { workspaceStore } from '../../features/workspaces'; +import UIStore from '../../stores/UIStore'; export default @inject('stores', 'actions') @observer class SettingsContainer extends Component { portalRoot = document.querySelector('#portalContainer'); @@ -57,8 +58,6 @@ SettingsContainer.wrappedComponent.propTypes = { services: PropTypes.instanceOf(ServicesStore).isRequired, }).isRequired, actions: PropTypes.shape({ - ui: PropTypes.shape({ - closeSettings: PropTypes.func.isRequired, - }), + ui: PropTypes.instanceOf(UIStore).isRequired, }).isRequired, }; 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'; import SupportFerdi from '../../components/settings/supportFerdi/SupportFerdiDashboard'; import ErrorBoundary from '../../components/util/ErrorBoundary'; +import AppStore from '../../stores/AppStore'; export default @inject('actions') class SupportScreen extends Component { constructor(props) { @@ -29,8 +30,6 @@ export default @inject('actions') class SupportScreen extends Component { SupportScreen.wrappedComponent.propTypes = { actions: PropTypes.shape({ - app: PropTypes.shape({ - openExternalUrl: PropTypes.func.isRequired, - }).isRequired, + app: PropTypes.instanceOf(AppStore).isRequired, }).isRequired, }; 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'; import TeamDashboard from '../../components/settings/team/TeamDashboard'; import ErrorBoundary from '../../components/util/ErrorBoundary'; import { DEV_API_FRANZ_WEBSITE } from '../../config'; +import PaymentStore from '../../stores/PaymentStore'; export default @inject('stores', 'actions') @observer class TeamScreen extends Component { handleWebsiteLink(route) { @@ -47,15 +48,8 @@ TeamScreen.wrappedComponent.propTypes = { settings: PropTypes.instanceOf(SettingsStore).isRequired, }).isRequired, actions: PropTypes.shape({ - payment: PropTypes.shape({ - createDashboardUrl: PropTypes.func.isRequired, - }).isRequired, - app: PropTypes.shape({ - openExternalUrl: PropTypes.func.isRequired, - }).isRequired, - user: PropTypes.shape({ - update: PropTypes.func.isRequired, - delete: PropTypes.func.isRequired, - }).isRequired, + payment: PropTypes.instanceOf(PaymentStore).isRequired, + app: PropTypes.instanceOf(AppStore).isRequired, + user: PropTypes.instanceOf(UserStore).isRequired, }).isRequired, }; -- cgit v1.2.3-70-g09d2