diff options
author | Dominik Guzei <dominik.guzei@gmail.com> | 2019-04-11 12:00:07 +0200 |
---|---|---|
committer | Dominik Guzei <dominik.guzei@gmail.com> | 2019-04-11 12:00:07 +0200 |
commit | e43d6bd80b3d76aae627fa8174eea98c14016549 (patch) | |
tree | de1d0a3ba10100ce68d0cb1ed618095e362fe573 /src/containers | |
parent | implements basic release announcement feature (diff) | |
parent | handle deleted services that are attached to workspaces (diff) | |
download | ferdium-app-e43d6bd80b3d76aae627fa8174eea98c14016549.tar.gz ferdium-app-e43d6bd80b3d76aae627fa8174eea98c14016549.tar.zst ferdium-app-e43d6bd80b3d76aae627fa8174eea98c14016549.zip |
merge-in workspace feature
Diffstat (limited to 'src/containers')
-rw-r--r-- | src/containers/layout/AppLayoutContainer.js | 15 | ||||
-rw-r--r-- | src/containers/settings/SettingsWindow.js | 2 |
2 files changed, 17 insertions, 0 deletions
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js index f26e51517..0357f63bd 100644 --- a/src/containers/layout/AppLayoutContainer.js +++ b/src/containers/layout/AppLayoutContainer.js | |||
@@ -21,6 +21,9 @@ 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 { announcementsState } from '../../features/announcements/state'; | 23 | import { announcementsState } from '../../features/announcements/state'; |
24 | import { workspaceActions } from '../../features/workspaces/actions'; | ||
25 | import WorkspaceDrawer from '../../features/workspaces/components/WorkspaceDrawer'; | ||
26 | import { workspaceStore } from '../../features/workspaces'; | ||
24 | 27 | ||
25 | export default @inject('stores', 'actions') @observer class AppLayoutContainer extends Component { | 28 | export default @inject('stores', 'actions') @observer class AppLayoutContainer extends Component { |
26 | static defaultProps = { | 29 | static defaultProps = { |
@@ -83,6 +86,15 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e | |||
83 | ); | 86 | ); |
84 | } | 87 | } |
85 | 88 | ||
89 | const workspacesDrawer = ( | ||
90 | <WorkspaceDrawer | ||
91 | getServicesForWorkspace={workspace => ( | ||
92 | workspace ? workspaceStore.getWorkspaceServices(workspace).map(s => s.name) : services.all.map(s => s.name) | ||
93 | )} | ||
94 | onUpgradeAccountClick={() => openSettings({ path: 'user' })} | ||
95 | /> | ||
96 | ); | ||
97 | |||
86 | const sidebar = ( | 98 | const sidebar = ( |
87 | <Sidebar | 99 | <Sidebar |
88 | services={services.allDisplayed} | 100 | services={services.allDisplayed} |
@@ -97,6 +109,8 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e | |||
97 | deleteService={deleteService} | 109 | deleteService={deleteService} |
98 | updateService={updateService} | 110 | updateService={updateService} |
99 | toggleMuteApp={toggleMuteApp} | 111 | toggleMuteApp={toggleMuteApp} |
112 | toggleWorkspaceDrawer={workspaceActions.toggleWorkspaceDrawer} | ||
113 | isWorkspaceDrawerOpen={workspaceStore.isWorkspaceDrawerOpen} | ||
100 | showMessageBadgeWhenMutedSetting={settings.all.app.showMessageBadgeWhenMuted} | 114 | showMessageBadgeWhenMutedSetting={settings.all.app.showMessageBadgeWhenMuted} |
101 | showMessageBadgesEvenWhenMuted={ui.showMessageBadgesEvenWhenMuted} | 115 | showMessageBadgesEvenWhenMuted={ui.showMessageBadgesEvenWhenMuted} |
102 | /> | 116 | /> |
@@ -123,6 +137,7 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e | |||
123 | showServicesUpdatedInfoBar={ui.showServicesUpdatedInfoBar} | 137 | showServicesUpdatedInfoBar={ui.showServicesUpdatedInfoBar} |
124 | appUpdateIsDownloaded={app.updateStatus === app.updateStatusTypes.DOWNLOADED} | 138 | appUpdateIsDownloaded={app.updateStatus === app.updateStatusTypes.DOWNLOADED} |
125 | sidebar={sidebar} | 139 | sidebar={sidebar} |
140 | workspacesDrawer={workspacesDrawer} | ||
126 | services={servicesContainer} | 141 | services={servicesContainer} |
127 | news={news.latest} | 142 | news={news.latest} |
128 | removeNewsItem={hide} | 143 | removeNewsItem={hide} |
diff --git a/src/containers/settings/SettingsWindow.js b/src/containers/settings/SettingsWindow.js index 6d9e0ee77..663b9e2e4 100644 --- a/src/containers/settings/SettingsWindow.js +++ b/src/containers/settings/SettingsWindow.js | |||
@@ -7,6 +7,7 @@ import ServicesStore from '../../stores/ServicesStore'; | |||
7 | import Layout from '../../components/settings/SettingsLayout'; | 7 | import Layout from '../../components/settings/SettingsLayout'; |
8 | import Navigation from '../../components/settings/navigation/SettingsNavigation'; | 8 | import Navigation from '../../components/settings/navigation/SettingsNavigation'; |
9 | import ErrorBoundary from '../../components/util/ErrorBoundary'; | 9 | import ErrorBoundary from '../../components/util/ErrorBoundary'; |
10 | import { workspaceStore } from '../../features/workspaces'; | ||
10 | 11 | ||
11 | export default @inject('stores', 'actions') @observer class SettingsContainer extends Component { | 12 | export default @inject('stores', 'actions') @observer class SettingsContainer extends Component { |
12 | render() { | 13 | render() { |
@@ -16,6 +17,7 @@ export default @inject('stores', 'actions') @observer class SettingsContainer ex | |||
16 | const navigation = ( | 17 | const navigation = ( |
17 | <Navigation | 18 | <Navigation |
18 | serviceCount={stores.services.all.length} | 19 | serviceCount={stores.services.all.length} |
20 | workspaceCount={workspaceStore.workspaces.length} | ||
19 | /> | 21 | /> |
20 | ); | 22 | ); |
21 | 23 | ||