diff options
author | 2018-02-27 13:32:59 +0100 | |
---|---|---|
committer | 2018-02-27 13:32:59 +0100 | |
commit | 29a69b86a2d2a76a66813c4099952f9d46ec7a9f (patch) | |
tree | 6a6b696d7ea2e63c77cbd01100aaf1ec1c507c13 /src/containers/layout | |
parent | Merge branch 'feature/features-api' into feature/enterprise-ui (diff) | |
download | ferdium-app-29a69b86a2d2a76a66813c4099952f9d46ec7a9f.tar.gz ferdium-app-29a69b86a2d2a76a66813c4099952f9d46ec7a9f.tar.zst ferdium-app-29a69b86a2d2a76a66813c4099952f9d46ec7a9f.zip |
adapt enterprise UI flags to features-api
Diffstat (limited to 'src/containers/layout')
-rw-r--r-- | src/containers/layout/AppLayoutContainer.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js index 2db2b7bb7..7a398ed2d 100644 --- a/src/containers/layout/AppLayoutContainer.js +++ b/src/containers/layout/AppLayoutContainer.js | |||
@@ -5,6 +5,7 @@ import { inject, observer } from 'mobx-react'; | |||
5 | import AppStore from '../../stores/AppStore'; | 5 | import AppStore from '../../stores/AppStore'; |
6 | import RecipesStore from '../../stores/RecipesStore'; | 6 | import RecipesStore from '../../stores/RecipesStore'; |
7 | import ServicesStore from '../../stores/ServicesStore'; | 7 | import ServicesStore from '../../stores/ServicesStore'; |
8 | import FeaturesStore from '../../stores/FeaturesStore'; | ||
8 | import UIStore from '../../stores/UIStore'; | 9 | import UIStore from '../../stores/UIStore'; |
9 | import NewsStore from '../../stores/NewsStore'; | 10 | import NewsStore from '../../stores/NewsStore'; |
10 | import SettingsStore from '../../stores/SettingsStore'; | 11 | import SettingsStore from '../../stores/SettingsStore'; |
@@ -66,7 +67,7 @@ export default class AppLayoutContainer extends Component { | |||
66 | const { children } = this.props; | 67 | const { children } = this.props; |
67 | 68 | ||
68 | const isLoadingFeatures = features.featuresRequest.isExecuting | 69 | const isLoadingFeatures = features.featuresRequest.isExecuting |
69 | && features.featuresRequest.isExecutingFirstTime; | 70 | && !features.featuresRequest.wasExecuted; |
70 | 71 | ||
71 | const isLoadingServices = services.allServicesRequest.isExecuting | 72 | const isLoadingServices = services.allServicesRequest.isExecuting |
72 | && services.allServicesRequest.isExecutingFirstTime; | 73 | && services.allServicesRequest.isExecutingFirstTime; |
@@ -134,6 +135,7 @@ export default class AppLayoutContainer extends Component { | |||
134 | AppLayoutContainer.wrappedComponent.propTypes = { | 135 | AppLayoutContainer.wrappedComponent.propTypes = { |
135 | stores: PropTypes.shape({ | 136 | stores: PropTypes.shape({ |
136 | services: PropTypes.instanceOf(ServicesStore).isRequired, | 137 | services: PropTypes.instanceOf(ServicesStore).isRequired, |
138 | features: PropTypes.instanceOf(FeaturesStore).isRequired, | ||
137 | recipes: PropTypes.instanceOf(RecipesStore).isRequired, | 139 | recipes: PropTypes.instanceOf(RecipesStore).isRequired, |
138 | app: PropTypes.instanceOf(AppStore).isRequired, | 140 | app: PropTypes.instanceOf(AppStore).isRequired, |
139 | ui: PropTypes.instanceOf(UIStore).isRequired, | 141 | ui: PropTypes.instanceOf(UIStore).isRequired, |