diff options
Diffstat (limited to 'src/containers/auth/AuthLayoutContainer.js')
-rw-r--r-- | src/containers/auth/AuthLayoutContainer.js | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/containers/auth/AuthLayoutContainer.js b/src/containers/auth/AuthLayoutContainer.js index f99a8a73f..a0d50ab54 100644 --- a/src/containers/auth/AuthLayoutContainer.js +++ b/src/containers/auth/AuthLayoutContainer.js | |||
@@ -14,7 +14,10 @@ import AppLoader from '../../components/ui/AppLoader'; | |||
14 | import { oneOrManyChildElements } from '../../prop-types'; | 14 | import { oneOrManyChildElements } from '../../prop-types'; |
15 | import FeaturesStore from '../../stores/FeaturesStore'; | 15 | import FeaturesStore from '../../stores/FeaturesStore'; |
16 | 16 | ||
17 | export default @inject('stores', 'actions') @observer class AuthLayoutContainer extends Component { | 17 | export default |
18 | @inject('stores', 'actions') | ||
19 | @observer | ||
20 | class AuthLayoutContainer extends Component { | ||
18 | static propTypes = { | 21 | static propTypes = { |
19 | children: oneOrManyChildElements.isRequired, | 22 | children: oneOrManyChildElements.isRequired, |
20 | location: PropTypes.shape({ | 23 | location: PropTypes.shape({ |
@@ -23,15 +26,12 @@ export default @inject('stores', 'actions') @observer class AuthLayoutContainer | |||
23 | }; | 26 | }; |
24 | 27 | ||
25 | render() { | 28 | render() { |
26 | const { | 29 | const { stores, actions, children, location } = this.props; |
27 | stores, actions, children, location, | 30 | const { app, features, globalError, user } = stores; |
28 | } = this.props; | ||
29 | const { | ||
30 | app, features, globalError, user, | ||
31 | } = stores; | ||
32 | 31 | ||
33 | const isLoadingBaseFeatures = features.defaultFeaturesRequest.isExecuting | 32 | const isLoadingBaseFeatures = |
34 | && !features.defaultFeaturesRequest.wasExecuted; | 33 | features.defaultFeaturesRequest.isExecuting && |
34 | !features.defaultFeaturesRequest.wasExecuted; | ||
35 | 35 | ||
36 | if (isLoadingBaseFeatures) { | 36 | if (isLoadingBaseFeatures) { |
37 | return ( | 37 | return ( |
@@ -61,8 +61,9 @@ export default @inject('stores', 'actions') @observer class AuthLayoutContainer | |||
61 | isHealthCheckLoading={app.healthCheckRequest.isExecuting} | 61 | isHealthCheckLoading={app.healthCheckRequest.isExecuting} |
62 | isFullScreen={app.isFullScreen} | 62 | isFullScreen={app.isFullScreen} |
63 | installAppUpdate={actions.app.installUpdate} | 63 | installAppUpdate={actions.app.installUpdate} |
64 | nextAppReleaseVersion={app.nextAppReleaseVersion} | 64 | appUpdateIsDownloaded={ |
65 | appUpdateIsDownloaded={app.updateStatus === app.updateStatusTypes.DOWNLOADED} | 65 | app.updateStatus === app.updateStatusTypes.DOWNLOADED |
66 | } | ||
66 | > | 67 | > |
67 | {children} | 68 | {children} |
68 | </AuthLayout> | 69 | </AuthLayout> |