diff options
Diffstat (limited to 'src/containers/layout/AppLayoutContainer.js')
-rw-r--r-- | src/containers/layout/AppLayoutContainer.js | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js index c70144c8e..4bcd17409 100644 --- a/src/containers/layout/AppLayoutContainer.js +++ b/src/containers/layout/AppLayoutContainer.js | |||
@@ -22,7 +22,6 @@ import AppLoader from '../../components/ui/AppLoader'; | |||
22 | import { workspaceActions } from '../../features/workspaces/actions'; | 22 | import { workspaceActions } from '../../features/workspaces/actions'; |
23 | import WorkspaceDrawer from '../../features/workspaces/components/WorkspaceDrawer'; | 23 | import WorkspaceDrawer from '../../features/workspaces/components/WorkspaceDrawer'; |
24 | import { workspaceStore } from '../../features/workspaces'; | 24 | import { workspaceStore } from '../../features/workspaces'; |
25 | import WorkspacesStore from '../../features/workspaces/store'; | ||
26 | 25 | ||
27 | class AppLayoutContainer extends Component { | 26 | class AppLayoutContainer extends Component { |
28 | static defaultProps = { | 27 | static defaultProps = { |
@@ -39,7 +38,6 @@ class AppLayoutContainer extends Component { | |||
39 | globalError, | 38 | globalError, |
40 | requests, | 39 | requests, |
41 | user, | 40 | user, |
42 | workspaces, | ||
43 | router | 41 | router |
44 | } = this.props.stores; | 42 | } = this.props.stores; |
45 | 43 | ||
@@ -85,10 +83,12 @@ class AppLayoutContainer extends Component { | |||
85 | services.allServicesRequest.isExecuting && | 83 | services.allServicesRequest.isExecuting && |
86 | services.allServicesRequest.isExecutingFirstTime; | 84 | services.allServicesRequest.isExecutingFirstTime; |
87 | 85 | ||
86 | const isLoadingSettings = !settings.loaded; | ||
87 | |||
88 | if ( | 88 | if ( |
89 | isLoadingSettings || | ||
89 | isLoadingFeatures || | 90 | isLoadingFeatures || |
90 | isLoadingServices || | 91 | isLoadingServices |
91 | workspaces.isLoadingWorkspaces | ||
92 | ) { | 92 | ) { |
93 | return ( | 93 | return ( |
94 | <ThemeProvider theme={ui.theme}> | 94 | <ThemeProvider theme={ui.theme}> |
@@ -191,7 +191,6 @@ AppLayoutContainer.propTypes = { | |||
191 | user: PropTypes.instanceOf(UserStore).isRequired, | 191 | user: PropTypes.instanceOf(UserStore).isRequired, |
192 | requests: PropTypes.instanceOf(RequestStore).isRequired, | 192 | requests: PropTypes.instanceOf(RequestStore).isRequired, |
193 | globalError: PropTypes.instanceOf(GlobalErrorStore).isRequired, | 193 | globalError: PropTypes.instanceOf(GlobalErrorStore).isRequired, |
194 | workspaces: PropTypes.instanceOf(WorkspacesStore).isRequired, | ||
195 | }).isRequired, | 194 | }).isRequired, |
196 | actions: PropTypes.shape({ | 195 | actions: PropTypes.shape({ |
197 | service: PropTypes.instanceOf(ServicesStore).isRequired, | 196 | service: PropTypes.instanceOf(ServicesStore).isRequired, |