diff options
-rw-r--r-- | src/containers/layout/AppLayoutContainer.js | 5 | ||||
-rw-r--r-- | src/features/workspaces/store.js | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js index a14a98554..5563c48bc 100644 --- a/src/containers/layout/AppLayoutContainer.js +++ b/src/containers/layout/AppLayoutContainer.js | |||
@@ -24,6 +24,7 @@ import { state as delayAppState } from '../../features/delayApp'; | |||
24 | import { workspaceActions } from '../../features/workspaces/actions'; | 24 | import { workspaceActions } from '../../features/workspaces/actions'; |
25 | import WorkspaceDrawer from '../../features/workspaces/components/WorkspaceDrawer'; | 25 | import WorkspaceDrawer from '../../features/workspaces/components/WorkspaceDrawer'; |
26 | import { workspaceStore } from '../../features/workspaces'; | 26 | import { workspaceStore } from '../../features/workspaces'; |
27 | import WorkspacesStore from '../../features/workspaces/store'; | ||
27 | 28 | ||
28 | export default @inject('stores', 'actions') @observer class AppLayoutContainer extends Component { | 29 | export default @inject('stores', 'actions') @observer class AppLayoutContainer extends Component { |
29 | static defaultProps = { | 30 | static defaultProps = { |
@@ -41,6 +42,7 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e | |||
41 | globalError, | 42 | globalError, |
42 | requests, | 43 | requests, |
43 | user, | 44 | user, |
45 | workspaces, | ||
44 | } = this.props.stores; | 46 | } = this.props.stores; |
45 | 47 | ||
46 | const { | 48 | const { |
@@ -79,7 +81,7 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e | |||
79 | const isLoadingServices = services.allServicesRequest.isExecuting | 81 | const isLoadingServices = services.allServicesRequest.isExecuting |
80 | && services.allServicesRequest.isExecutingFirstTime; | 82 | && services.allServicesRequest.isExecutingFirstTime; |
81 | 83 | ||
82 | if (isLoadingFeatures || isLoadingServices) { | 84 | if (isLoadingFeatures || isLoadingServices || workspaces.isLoadingWorkspaces) { |
83 | return ( | 85 | return ( |
84 | <ThemeProvider theme={ui.theme}> | 86 | <ThemeProvider theme={ui.theme}> |
85 | <AppLoader /> | 87 | <AppLoader /> |
@@ -174,6 +176,7 @@ AppLayoutContainer.wrappedComponent.propTypes = { | |||
174 | user: PropTypes.instanceOf(UserStore).isRequired, | 176 | user: PropTypes.instanceOf(UserStore).isRequired, |
175 | requests: PropTypes.instanceOf(RequestStore).isRequired, | 177 | requests: PropTypes.instanceOf(RequestStore).isRequired, |
176 | globalError: PropTypes.instanceOf(GlobalErrorStore).isRequired, | 178 | globalError: PropTypes.instanceOf(GlobalErrorStore).isRequired, |
179 | workspaces: PropTypes.instanceOf(WorkspacesStore).isRequired, | ||
177 | }).isRequired, | 180 | }).isRequired, |
178 | actions: PropTypes.shape({ | 181 | actions: PropTypes.shape({ |
179 | service: PropTypes.shape({ | 182 | service: PropTypes.shape({ |
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js index f08323e6c..b83fe335a 100644 --- a/src/features/workspaces/store.js +++ b/src/features/workspaces/store.js | |||
@@ -45,6 +45,11 @@ export default class WorkspacesStore extends FeatureStore { | |||
45 | return getUserWorkspacesRequest.result || []; | 45 | return getUserWorkspacesRequest.result || []; |
46 | } | 46 | } |
47 | 47 | ||
48 | @computed get isLoadingWorkspaces() { | ||
49 | if (!this.isFeatureActive) return false; | ||
50 | return getUserWorkspacesRequest.isExecutingFirstTime; | ||
51 | } | ||
52 | |||
48 | @computed get settings() { | 53 | @computed get settings() { |
49 | return localStorage.getItem('workspaces') || {}; | 54 | return localStorage.getItem('workspaces') || {}; |
50 | } | 55 | } |