aboutsummaryrefslogtreecommitdiffstats
path: root/src/containers/layout/AppLayoutContainer.js
diff options
context:
space:
mode:
authorLibravatar haraldox <hnaumann+github@gmail.com>2018-02-27 13:32:59 +0100
committerLibravatar haraldox <hnaumann+github@gmail.com>2018-02-27 13:32:59 +0100
commit29a69b86a2d2a76a66813c4099952f9d46ec7a9f (patch)
tree6a6b696d7ea2e63c77cbd01100aaf1ec1c507c13 /src/containers/layout/AppLayoutContainer.js
parentMerge branch 'feature/features-api' into feature/enterprise-ui (diff)
downloadferdium-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/AppLayoutContainer.js')
-rw-r--r--src/containers/layout/AppLayoutContainer.js4
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';
5import AppStore from '../../stores/AppStore'; 5import AppStore from '../../stores/AppStore';
6import RecipesStore from '../../stores/RecipesStore'; 6import RecipesStore from '../../stores/RecipesStore';
7import ServicesStore from '../../stores/ServicesStore'; 7import ServicesStore from '../../stores/ServicesStore';
8import FeaturesStore from '../../stores/FeaturesStore';
8import UIStore from '../../stores/UIStore'; 9import UIStore from '../../stores/UIStore';
9import NewsStore from '../../stores/NewsStore'; 10import NewsStore from '../../stores/NewsStore';
10import SettingsStore from '../../stores/SettingsStore'; 11import 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 {
134AppLayoutContainer.wrappedComponent.propTypes = { 135AppLayoutContainer.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,