diff options
author | Dominik Guzei <dominik.guzei@gmail.com> | 2019-03-19 19:38:56 +0100 |
---|---|---|
committer | Dominik Guzei <dominik.guzei@gmail.com> | 2019-03-19 19:40:08 +0100 |
commit | e4f1862644d5921e2ee77078c10e16efa3e58c7b (patch) | |
tree | ff7f23eb83ee974a9f719ed6f58647ce7f0a1175 /src/containers/layout | |
parent | fix conflicts with latest develop (diff) | |
download | ferdium-app-e4f1862644d5921e2ee77078c10e16efa3e58c7b.tar.gz ferdium-app-e4f1862644d5921e2ee77078c10e16efa3e58c7b.tar.zst ferdium-app-e4f1862644d5921e2ee77078c10e16efa3e58c7b.zip |
add workspace drawer
Diffstat (limited to 'src/containers/layout')
-rw-r--r-- | src/containers/layout/AppLayoutContainer.js | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js index 5a05ce431..772458eab 100644 --- a/src/containers/layout/AppLayoutContainer.js +++ b/src/containers/layout/AppLayoutContainer.js | |||
@@ -20,6 +20,9 @@ import Services from '../../components/services/content/Services'; | |||
20 | import AppLoader from '../../components/ui/AppLoader'; | 20 | import AppLoader from '../../components/ui/AppLoader'; |
21 | 21 | ||
22 | import { state as delayAppState } from '../../features/delayApp'; | 22 | import { state as delayAppState } from '../../features/delayApp'; |
23 | import { workspacesState } from '../../features/workspaces/state'; | ||
24 | import { workspaceActions } from '../../features/workspaces/actions'; | ||
25 | import WorkspaceDrawer from '../../features/workspaces/components/WorkspaceDrawer'; | ||
23 | 26 | ||
24 | export default @inject('stores', 'actions') @observer class AppLayoutContainer extends Component { | 27 | export default @inject('stores', 'actions') @observer class AppLayoutContainer extends Component { |
25 | static defaultProps = { | 28 | static defaultProps = { |
@@ -82,6 +85,14 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e | |||
82 | ); | 85 | ); |
83 | } | 86 | } |
84 | 87 | ||
88 | const workspacesDrawer = ( | ||
89 | <WorkspaceDrawer | ||
90 | getServicesForWorkspace={workspace => ( | ||
91 | workspace ? workspace.services.map(id => services.one(id).name) : services.all.map(s => s.name) | ||
92 | )} | ||
93 | /> | ||
94 | ); | ||
95 | |||
85 | const sidebar = ( | 96 | const sidebar = ( |
86 | <Sidebar | 97 | <Sidebar |
87 | services={services.allDisplayed} | 98 | services={services.allDisplayed} |
@@ -96,6 +107,8 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e | |||
96 | deleteService={deleteService} | 107 | deleteService={deleteService} |
97 | updateService={updateService} | 108 | updateService={updateService} |
98 | toggleMuteApp={toggleMuteApp} | 109 | toggleMuteApp={toggleMuteApp} |
110 | toggleWorkspaceDrawer={workspaceActions.toggleWorkspaceDrawer} | ||
111 | isWorkspaceDrawerOpen={workspacesState.isWorkspaceDrawerOpen} | ||
99 | showMessageBadgeWhenMutedSetting={settings.all.app.showMessageBadgeWhenMuted} | 112 | showMessageBadgeWhenMutedSetting={settings.all.app.showMessageBadgeWhenMuted} |
100 | showMessageBadgesEvenWhenMuted={ui.showMessageBadgesEvenWhenMuted} | 113 | showMessageBadgesEvenWhenMuted={ui.showMessageBadgesEvenWhenMuted} |
101 | /> | 114 | /> |
@@ -122,6 +135,7 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e | |||
122 | showServicesUpdatedInfoBar={ui.showServicesUpdatedInfoBar} | 135 | showServicesUpdatedInfoBar={ui.showServicesUpdatedInfoBar} |
123 | appUpdateIsDownloaded={app.updateStatus === app.updateStatusTypes.DOWNLOADED} | 136 | appUpdateIsDownloaded={app.updateStatus === app.updateStatusTypes.DOWNLOADED} |
124 | sidebar={sidebar} | 137 | sidebar={sidebar} |
138 | workspacesDrawer={workspacesDrawer} | ||
125 | services={servicesContainer} | 139 | services={servicesContainer} |
126 | news={news.latest} | 140 | news={news.latest} |
127 | removeNewsItem={hide} | 141 | removeNewsItem={hide} |