diff options
Diffstat (limited to 'src/features')
10 files changed, 27 insertions, 42 deletions
diff --git a/src/features/announcements/components/AnnouncementScreen.js b/src/features/announcements/components/AnnouncementScreen.js index 2f25e7139..659cb4961 100644 --- a/src/features/announcements/components/AnnouncementScreen.js +++ b/src/features/announcements/components/AnnouncementScreen.js | |||
@@ -8,6 +8,7 @@ import { Button } from '@meetfranz/forms'; | |||
8 | 8 | ||
9 | import { announcementsStore } from '../index'; | 9 | import { announcementsStore } from '../index'; |
10 | import UIStore from '../../../stores/UIStore'; | 10 | import UIStore from '../../../stores/UIStore'; |
11 | import AppStore from '../../../stores/AppStore'; | ||
11 | 12 | ||
12 | const renderer = new marked.Renderer(); | 13 | const renderer = new marked.Renderer(); |
13 | 14 | ||
@@ -193,9 +194,7 @@ class AnnouncementScreen extends Component { | |||
193 | ui: PropTypes.instanceOf(UIStore).isRequired, | 194 | ui: PropTypes.instanceOf(UIStore).isRequired, |
194 | }).isRequired, | 195 | }).isRequired, |
195 | actions: PropTypes.shape({ | 196 | actions: PropTypes.shape({ |
196 | app: PropTypes.shape({ | 197 | app: PropTypes.instanceOf(AppStore).isRequired, |
197 | openExternalUrl: PropTypes.func.isRequired, | ||
198 | }).isRequired, | ||
199 | }).isRequired, | 198 | }).isRequired, |
200 | }; | 199 | }; |
201 | 200 | ||
diff --git a/src/features/delayApp/Component.js b/src/features/delayApp/Component.js index 4ea37f88d..6471240ab 100644 --- a/src/features/delayApp/Component.js +++ b/src/features/delayApp/Component.js | |||
@@ -9,6 +9,8 @@ import { Button } from '@meetfranz/forms'; | |||
9 | import { config } from './constants'; | 9 | import { config } from './constants'; |
10 | import styles from './styles'; | 10 | import styles from './styles'; |
11 | import UserStore from '../../stores/UserStore'; | 11 | import UserStore from '../../stores/UserStore'; |
12 | import UIStore from '../../stores/UIStore'; | ||
13 | import { FeatureStore } from '../utils/FeatureStore'; | ||
12 | 14 | ||
13 | const messages = defineMessages({ | 15 | const messages = defineMessages({ |
14 | headline: { | 16 | headline: { |
@@ -109,10 +111,10 @@ export default @inject('stores', 'actions') @injectSheet(styles) @observer class | |||
109 | DelayApp.wrappedComponent.propTypes = { | 111 | DelayApp.wrappedComponent.propTypes = { |
110 | stores: PropTypes.shape({ | 112 | stores: PropTypes.shape({ |
111 | user: PropTypes.instanceOf(UserStore).isRequired, | 113 | user: PropTypes.instanceOf(UserStore).isRequired, |
114 | features: PropTypes.instanceOf(FeatureStore).isRequired, | ||
112 | }).isRequired, | 115 | }).isRequired, |
113 | actions: PropTypes.shape({ | 116 | actions: PropTypes.shape({ |
114 | ui: PropTypes.shape({ | 117 | ui: PropTypes.instanceOf(UIStore).isRequired, |
115 | openSettings: PropTypes.func.isRequired, | 118 | user: PropTypes.instanceOf(UserStore).isRequired, |
116 | }).isRequired, | ||
117 | }).isRequired, | 119 | }).isRequired, |
118 | }; | 120 | }; |
diff --git a/src/features/nightlyBuilds/Component.js b/src/features/nightlyBuilds/Component.js index 3133672ec..5a809aaf2 100644 --- a/src/features/nightlyBuilds/Component.js +++ b/src/features/nightlyBuilds/Component.js | |||
@@ -9,6 +9,8 @@ import Modal from '../../components/ui/Modal'; | |||
9 | import Button from '../../components/ui/Button'; | 9 | import Button from '../../components/ui/Button'; |
10 | import { state as ModalState } from './store'; | 10 | import { state as ModalState } from './store'; |
11 | import SettingsStore from '../../stores/SettingsStore'; | 11 | import SettingsStore from '../../stores/SettingsStore'; |
12 | import UIStore from '../../stores/UIStore'; | ||
13 | import UserStore from '../../stores/UserStore'; | ||
12 | 14 | ||
13 | const messages = defineMessages({ | 15 | const messages = defineMessages({ |
14 | title: { | 16 | title: { |
@@ -127,15 +129,9 @@ nightlyBuildsModal.wrappedComponent.propTypes = { | |||
127 | settings: PropTypes.instanceOf(SettingsStore).isRequired, | 129 | settings: PropTypes.instanceOf(SettingsStore).isRequired, |
128 | }).isRequired, | 130 | }).isRequired, |
129 | actions: PropTypes.shape({ | 131 | actions: PropTypes.shape({ |
130 | settings: PropTypes.shape({ | 132 | settings: PropTypes.instanceOf(SettingsStore).isRequired, |
131 | update: PropTypes.func.isRequired, | 133 | user: PropTypes.instanceOf(UserStore).isRequired, |
132 | }).isRequired, | 134 | ui: PropTypes.instanceOf(UIStore).isRequired, |
133 | user: PropTypes.shape({ | ||
134 | update: PropTypes.func.isRequired, | ||
135 | }).isRequired, | ||
136 | ui: PropTypes.shape({ | ||
137 | openSettings: PropTypes.func.isRequired, | ||
138 | }).isRequired, | ||
139 | }).isRequired, | 135 | }).isRequired, |
140 | classes: PropTypes.object.isRequired, | 136 | classes: PropTypes.object.isRequired, |
141 | }; | 137 | }; |
diff --git a/src/features/planSelection/containers/PlanSelectionScreen.js b/src/features/planSelection/containers/PlanSelectionScreen.js index fba65506e..594829c01 100644 --- a/src/features/planSelection/containers/PlanSelectionScreen.js +++ b/src/features/planSelection/containers/PlanSelectionScreen.js | |||
@@ -9,6 +9,7 @@ import UserStore from '../../../stores/UserStore'; | |||
9 | import PlanSelection from '../components/PlanSelection'; | 9 | import PlanSelection from '../components/PlanSelection'; |
10 | import ErrorBoundary from '../../../components/util/ErrorBoundary'; | 10 | import ErrorBoundary from '../../../components/util/ErrorBoundary'; |
11 | import { planSelectionStore } from '..'; | 11 | import { planSelectionStore } from '..'; |
12 | import PaymentStore from '../../../stores/PaymentStore'; | ||
12 | 13 | ||
13 | const messages = defineMessages({ | 14 | const messages = defineMessages({ |
14 | dialogTitle: { | 15 | dialogTitle: { |
@@ -109,15 +110,11 @@ PlanSelectionScreen.wrappedComponent.propTypes = { | |||
109 | user: PropTypes.instanceOf(UserStore).isRequired, | 110 | user: PropTypes.instanceOf(UserStore).isRequired, |
110 | }).isRequired, | 111 | }).isRequired, |
111 | actions: PropTypes.shape({ | 112 | actions: PropTypes.shape({ |
112 | payment: PropTypes.shape({ | 113 | payment: PropTypes.instanceOf(PaymentStore), |
113 | upgradeAccount: PropTypes.func.isRequired, | ||
114 | }), | ||
115 | planSelection: PropTypes.shape({ | 114 | planSelection: PropTypes.shape({ |
116 | downgradeAccount: PropTypes.func.isRequired, | 115 | downgradeAccount: PropTypes.func.isRequired, |
117 | hideOverlay: PropTypes.func.isRequired, | 116 | hideOverlay: PropTypes.func.isRequired, |
118 | }), | 117 | }), |
119 | user: PropTypes.shape({ | 118 | user: PropTypes.instanceOf(UserStore).isRequired, |
120 | activateTrial: PropTypes.func.isRequired, | ||
121 | }), | ||
122 | }).isRequired, | 119 | }).isRequired, |
123 | }; | 120 | }; |
diff --git a/src/features/publishDebugInfo/Component.js b/src/features/publishDebugInfo/Component.js index 63f15fe7b..4308b8f09 100644 --- a/src/features/publishDebugInfo/Component.js +++ b/src/features/publishDebugInfo/Component.js | |||
@@ -11,6 +11,7 @@ import Input from '../../components/ui/Input'; | |||
11 | import Modal from '../../components/ui/Modal'; | 11 | import Modal from '../../components/ui/Modal'; |
12 | import { DEBUG_API } from '../../config'; | 12 | import { DEBUG_API } from '../../config'; |
13 | import AppStore from '../../stores/AppStore'; | 13 | import AppStore from '../../stores/AppStore'; |
14 | import ServicesStore from '../../stores/ServicesStore'; | ||
14 | 15 | ||
15 | 16 | ||
16 | const messages = defineMessages({ | 17 | const messages = defineMessages({ |
@@ -201,8 +202,6 @@ PublishDebugLogModal.wrappedComponent.propTypes = { | |||
201 | app: PropTypes.instanceOf(AppStore).isRequired, | 202 | app: PropTypes.instanceOf(AppStore).isRequired, |
202 | }).isRequired, | 203 | }).isRequired, |
203 | actions: PropTypes.shape({ | 204 | actions: PropTypes.shape({ |
204 | service: PropTypes.shape({ | 205 | service: PropTypes.instanceOf(ServicesStore).isRequired, |
205 | setActive: PropTypes.func.isRequired, | ||
206 | }).isRequired, | ||
207 | }).isRequired, | 206 | }).isRequired, |
208 | }; | 207 | }; |
diff --git a/src/features/quickSwitch/Component.js b/src/features/quickSwitch/Component.js index 01cd3b09b..04822db71 100644 --- a/src/features/quickSwitch/Component.js +++ b/src/features/quickSwitch/Component.js | |||
@@ -349,8 +349,6 @@ QuickSwitchModal.wrappedComponent.propTypes = { | |||
349 | services: PropTypes.instanceOf(ServicesStore).isRequired, | 349 | services: PropTypes.instanceOf(ServicesStore).isRequired, |
350 | }).isRequired, | 350 | }).isRequired, |
351 | actions: PropTypes.shape({ | 351 | actions: PropTypes.shape({ |
352 | service: PropTypes.shape({ | 352 | service: PropTypes.instanceOf(ServicesStore).isRequired, |
353 | setActive: PropTypes.func.isRequired, | ||
354 | }).isRequired, | ||
355 | }).isRequired, | 353 | }).isRequired, |
356 | }; | 354 | }; |
diff --git a/src/features/trialStatusBar/containers/TrialStatusBarScreen.js b/src/features/trialStatusBar/containers/TrialStatusBarScreen.js index e15a1204f..715251854 100644 --- a/src/features/trialStatusBar/containers/TrialStatusBarScreen.js +++ b/src/features/trialStatusBar/containers/TrialStatusBarScreen.js | |||
@@ -10,6 +10,7 @@ import TrialStatusBar from '../components/TrialStatusBar'; | |||
10 | import ErrorBoundary from '../../../components/util/ErrorBoundary'; | 10 | import ErrorBoundary from '../../../components/util/ErrorBoundary'; |
11 | import { trialStatusBarStore } from '..'; | 11 | import { trialStatusBarStore } from '..'; |
12 | import { i18nPlanName } from '../../../helpers/plan-helpers'; | 12 | import { i18nPlanName } from '../../../helpers/plan-helpers'; |
13 | import PaymentStore from '../../../stores/PaymentStore'; | ||
13 | 14 | ||
14 | @inject('stores', 'actions') @observer | 15 | @inject('stores', 'actions') @observer |
15 | class TrialStatusBarScreen extends Component { | 16 | class TrialStatusBarScreen extends Component { |
@@ -102,8 +103,6 @@ TrialStatusBarScreen.wrappedComponent.propTypes = { | |||
102 | user: PropTypes.instanceOf(UserStore).isRequired, | 103 | user: PropTypes.instanceOf(UserStore).isRequired, |
103 | }).isRequired, | 104 | }).isRequired, |
104 | actions: PropTypes.shape({ | 105 | actions: PropTypes.shape({ |
105 | payment: PropTypes.shape({ | 106 | payment: PropTypes.instanceOf(PaymentStore), |
106 | upgradeAccount: PropTypes.func.isRequired, | ||
107 | }), | ||
108 | }).isRequired, | 107 | }).isRequired, |
109 | }; | 108 | }; |
diff --git a/src/features/webControls/containers/WebControlsScreen.js b/src/features/webControls/containers/WebControlsScreen.js index 56ba60c37..d638b831c 100644 --- a/src/features/webControls/containers/WebControlsScreen.js +++ b/src/features/webControls/containers/WebControlsScreen.js | |||
@@ -7,6 +7,7 @@ import WebControls from '../components/WebControls'; | |||
7 | import ServicesStore from '../../../stores/ServicesStore'; | 7 | import ServicesStore from '../../../stores/ServicesStore'; |
8 | import Service from '../../../models/Service'; | 8 | import Service from '../../../models/Service'; |
9 | import { SEARCH_ENGINE_URLS } from '../../../config'; | 9 | import { SEARCH_ENGINE_URLS } from '../../../config'; |
10 | import AppStore from '../../../stores/AppStore'; | ||
10 | 11 | ||
11 | const URL_EVENTS = [ | 12 | const URL_EVENTS = [ |
12 | 'load-commit', | 13 | 'load-commit', |
@@ -128,11 +129,7 @@ WebControlsScreen.wrappedComponent.propTypes = { | |||
128 | services: PropTypes.instanceOf(ServicesStore).isRequired, | 129 | services: PropTypes.instanceOf(ServicesStore).isRequired, |
129 | }).isRequired, | 130 | }).isRequired, |
130 | actions: PropTypes.shape({ | 131 | actions: PropTypes.shape({ |
131 | app: PropTypes.shape({ | 132 | app: PropTypes.instanceOf(AppStore).isRequired, |
132 | openExternalUrl: PropTypes.func.isRequired, | 133 | service: PropTypes.instanceOf(ServicesStore).isRequired, |
133 | }).isRequired, | ||
134 | service: PropTypes.shape({ | ||
135 | reloadActive: PropTypes.func.isRequired, | ||
136 | }).isRequired, | ||
137 | }).isRequired, | 134 | }).isRequired, |
138 | }; | 135 | }; |
diff --git a/src/features/workspaces/containers/EditWorkspaceScreen.js b/src/features/workspaces/containers/EditWorkspaceScreen.js index 7eaabc1ea..5eca71259 100644 --- a/src/features/workspaces/containers/EditWorkspaceScreen.js +++ b/src/features/workspaces/containers/EditWorkspaceScreen.js | |||
@@ -8,14 +8,13 @@ import ServicesStore from '../../../stores/ServicesStore'; | |||
8 | import Workspace from '../models/Workspace'; | 8 | import Workspace from '../models/Workspace'; |
9 | import { workspaceStore } from '../index'; | 9 | import { workspaceStore } from '../index'; |
10 | import { deleteWorkspaceRequest, updateWorkspaceRequest } from '../api'; | 10 | import { deleteWorkspaceRequest, updateWorkspaceRequest } from '../api'; |
11 | import WorkspacesStore from '../store'; | ||
11 | 12 | ||
12 | @inject('stores', 'actions') @observer | 13 | @inject('stores', 'actions') @observer |
13 | class EditWorkspaceScreen extends Component { | 14 | class EditWorkspaceScreen extends Component { |
14 | static propTypes = { | 15 | static propTypes = { |
15 | actions: PropTypes.shape({ | 16 | actions: PropTypes.shape({ |
16 | workspace: PropTypes.shape({ | 17 | workspaces: PropTypes.instanceOf(WorkspacesStore), |
17 | delete: PropTypes.func.isRequired, | ||
18 | }), | ||
19 | }).isRequired, | 18 | }).isRequired, |
20 | stores: PropTypes.shape({ | 19 | stores: PropTypes.shape({ |
21 | services: PropTypes.instanceOf(ServicesStore).isRequired, | 20 | services: PropTypes.instanceOf(ServicesStore).isRequired, |
diff --git a/src/features/workspaces/containers/WorkspacesScreen.js b/src/features/workspaces/containers/WorkspacesScreen.js index affbd230d..c241cd622 100644 --- a/src/features/workspaces/containers/WorkspacesScreen.js +++ b/src/features/workspaces/containers/WorkspacesScreen.js | |||
@@ -10,14 +10,13 @@ import { | |||
10 | getUserWorkspacesRequest, | 10 | getUserWorkspacesRequest, |
11 | updateWorkspaceRequest, | 11 | updateWorkspaceRequest, |
12 | } from '../api'; | 12 | } from '../api'; |
13 | import WorkspacesStore from '../store'; | ||
13 | 14 | ||
14 | @inject('stores', 'actions') @observer | 15 | @inject('stores', 'actions') @observer |
15 | class WorkspacesScreen extends Component { | 16 | class WorkspacesScreen extends Component { |
16 | static propTypes = { | 17 | static propTypes = { |
17 | actions: PropTypes.shape({ | 18 | actions: PropTypes.shape({ |
18 | workspace: PropTypes.shape({ | 19 | workspaces: PropTypes.instanceOf(WorkspacesStore), |
19 | edit: PropTypes.func.isRequired, | ||
20 | }), | ||
21 | }).isRequired, | 20 | }).isRequired, |
22 | }; | 21 | }; |
23 | 22 | ||