diff options
Diffstat (limited to 'src/containers/layout/AppLayoutContainer.js')
-rw-r--r-- | src/containers/layout/AppLayoutContainer.js | 48 |
1 files changed, 28 insertions, 20 deletions
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js index 32b1f1cf7..83a25168b 100644 --- a/src/containers/layout/AppLayoutContainer.js +++ b/src/containers/layout/AppLayoutContainer.js | |||
@@ -25,7 +25,10 @@ import WorkspaceDrawer from '../../features/workspaces/components/WorkspaceDrawe | |||
25 | import { workspaceStore } from '../../features/workspaces'; | 25 | import { workspaceStore } from '../../features/workspaces'; |
26 | import WorkspacesStore from '../../features/workspaces/store'; | 26 | import WorkspacesStore from '../../features/workspaces/store'; |
27 | 27 | ||
28 | export default @inject('stores', 'actions') @observer class AppLayoutContainer extends Component { | 28 | export default |
29 | @inject('stores', 'actions') | ||
30 | @observer | ||
31 | class AppLayoutContainer extends Component { | ||
29 | static defaultProps = { | 32 | static defaultProps = { |
30 | children: null, | 33 | children: null, |
31 | }; | 34 | }; |
@@ -65,25 +68,25 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e | |||
65 | 68 | ||
66 | const { retryRequiredRequests } = this.props.actions.requests; | 69 | const { retryRequiredRequests } = this.props.actions.requests; |
67 | 70 | ||
68 | const { | 71 | const { installUpdate, toggleMuteApp } = this.props.actions.app; |
69 | installUpdate, | ||
70 | toggleMuteApp, | ||
71 | } = this.props.actions.app; | ||
72 | 72 | ||
73 | const { | 73 | const { openSettings, closeSettings } = this.props.actions.ui; |
74 | openSettings, | ||
75 | closeSettings, | ||
76 | } = this.props.actions.ui; | ||
77 | 74 | ||
78 | const { children } = this.props; | 75 | const { children } = this.props; |
79 | 76 | ||
80 | const isLoadingFeatures = features.featuresRequest.isExecuting | 77 | const isLoadingFeatures = |
81 | && !features.featuresRequest.wasExecuted; | 78 | features.featuresRequest.isExecuting && |
79 | !features.featuresRequest.wasExecuted; | ||
82 | 80 | ||
83 | const isLoadingServices = services.allServicesRequest.isExecuting | 81 | const isLoadingServices = |
84 | && services.allServicesRequest.isExecutingFirstTime; | 82 | services.allServicesRequest.isExecuting && |
83 | services.allServicesRequest.isExecutingFirstTime; | ||
85 | 84 | ||
86 | if (isLoadingFeatures || isLoadingServices || workspaces.isLoadingWorkspaces) { | 85 | if ( |
86 | isLoadingFeatures || | ||
87 | isLoadingServices || | ||
88 | workspaces.isLoadingWorkspaces | ||
89 | ) { | ||
87 | return ( | 90 | return ( |
88 | <ThemeProvider theme={ui.theme}> | 91 | <ThemeProvider theme={ui.theme}> |
89 | <AppLoader /> | 92 | <AppLoader /> |
@@ -93,9 +96,11 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e | |||
93 | 96 | ||
94 | const workspacesDrawer = ( | 97 | const workspacesDrawer = ( |
95 | <WorkspaceDrawer | 98 | <WorkspaceDrawer |
96 | getServicesForWorkspace={(workspace) => ( | 99 | getServicesForWorkspace={workspace => |
97 | workspace ? workspaceStore.getWorkspaceServices(workspace).map((s) => s.name) : services.all.map((s) => s.name) | 100 | (workspace |
98 | )} | 101 | ? workspaceStore.getWorkspaceServices(workspace).map(s => s.name) |
102 | : services.all.map(s => s.name)) | ||
103 | } | ||
99 | /> | 104 | /> |
100 | ); | 105 | ); |
101 | 106 | ||
@@ -118,7 +123,9 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e | |||
118 | toggleMuteApp={toggleMuteApp} | 123 | toggleMuteApp={toggleMuteApp} |
119 | toggleWorkspaceDrawer={workspaceActions.toggleWorkspaceDrawer} | 124 | toggleWorkspaceDrawer={workspaceActions.toggleWorkspaceDrawer} |
120 | isWorkspaceDrawerOpen={workspaceStore.isWorkspaceDrawerOpen} | 125 | isWorkspaceDrawerOpen={workspaceStore.isWorkspaceDrawerOpen} |
121 | showMessageBadgeWhenMutedSetting={settings.all.app.showMessageBadgeWhenMuted} | 126 | showMessageBadgeWhenMutedSetting={ |
127 | settings.all.app.showMessageBadgeWhenMuted | ||
128 | } | ||
122 | showMessageBadgesEvenWhenMuted={ui.showMessageBadgesEvenWhenMuted} | 129 | showMessageBadgesEvenWhenMuted={ui.showMessageBadgesEvenWhenMuted} |
123 | isTodosServiceActive={services.isTodosServiceActive || false} | 130 | isTodosServiceActive={services.isTodosServiceActive || false} |
124 | /> | 131 | /> |
@@ -145,8 +152,9 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e | |||
145 | isFullScreen={app.isFullScreen} | 152 | isFullScreen={app.isFullScreen} |
146 | isOnline={app.isOnline} | 153 | isOnline={app.isOnline} |
147 | showServicesUpdatedInfoBar={ui.showServicesUpdatedInfoBar} | 154 | showServicesUpdatedInfoBar={ui.showServicesUpdatedInfoBar} |
148 | appUpdateIsDownloaded={app.updateStatus === app.updateStatusTypes.DOWNLOADED} | 155 | appUpdateIsDownloaded={ |
149 | nextAppReleaseVersion={app.nextAppReleaseVersion} | 156 | app.updateStatus === app.updateStatusTypes.DOWNLOADED |
157 | } | ||
150 | authRequestFailed={app.authRequestFailed} | 158 | authRequestFailed={app.authRequestFailed} |
151 | sidebar={sidebar} | 159 | sidebar={sidebar} |
152 | workspacesDrawer={workspacesDrawer} | 160 | workspacesDrawer={workspacesDrawer} |