diff options
author | Dominik Guzei <dominik.guzei@gmail.com> | 2019-03-23 14:15:57 +0100 |
---|---|---|
committer | Dominik Guzei <dominik.guzei@gmail.com> | 2019-03-23 14:15:57 +0100 |
commit | 0af622e6e81a5aee64f839eeadd23b4a62b3cf62 (patch) | |
tree | 0e2264b83c3f57f2850062f6b7293bf06416bb49 /src/containers | |
parent | fix merge conflicts with latest develop (diff) | |
download | ferdium-app-0af622e6e81a5aee64f839eeadd23b4a62b3cf62.tar.gz ferdium-app-0af622e6e81a5aee64f839eeadd23b4a62b3cf62.tar.zst ferdium-app-0af622e6e81a5aee64f839eeadd23b4a62b3cf62.zip |
refactor state management for workspace feature
Diffstat (limited to 'src/containers')
-rw-r--r-- | src/containers/layout/AppLayoutContainer.js | 4 | ||||
-rw-r--r-- | src/containers/settings/SettingsWindow.js | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js index 772458eab..4329c3097 100644 --- a/src/containers/layout/AppLayoutContainer.js +++ b/src/containers/layout/AppLayoutContainer.js | |||
@@ -20,9 +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'; | 23 | import { workspaceActions } from '../../features/workspaces/actions'; |
25 | import WorkspaceDrawer from '../../features/workspaces/components/WorkspaceDrawer'; | 24 | import WorkspaceDrawer from '../../features/workspaces/components/WorkspaceDrawer'; |
25 | import { workspaceStore } from '../../features/workspaces'; | ||
26 | 26 | ||
27 | export default @inject('stores', 'actions') @observer class AppLayoutContainer extends Component { | 27 | export default @inject('stores', 'actions') @observer class AppLayoutContainer extends Component { |
28 | static defaultProps = { | 28 | static defaultProps = { |
@@ -108,7 +108,7 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e | |||
108 | updateService={updateService} | 108 | updateService={updateService} |
109 | toggleMuteApp={toggleMuteApp} | 109 | toggleMuteApp={toggleMuteApp} |
110 | toggleWorkspaceDrawer={workspaceActions.toggleWorkspaceDrawer} | 110 | toggleWorkspaceDrawer={workspaceActions.toggleWorkspaceDrawer} |
111 | isWorkspaceDrawerOpen={workspacesState.isWorkspaceDrawerOpen} | 111 | isWorkspaceDrawerOpen={workspaceStore.isWorkspaceDrawerOpen} |
112 | showMessageBadgeWhenMutedSetting={settings.all.app.showMessageBadgeWhenMuted} | 112 | showMessageBadgeWhenMutedSetting={settings.all.app.showMessageBadgeWhenMuted} |
113 | showMessageBadgesEvenWhenMuted={ui.showMessageBadgesEvenWhenMuted} | 113 | showMessageBadgesEvenWhenMuted={ui.showMessageBadgesEvenWhenMuted} |
114 | /> | 114 | /> |
diff --git a/src/containers/settings/SettingsWindow.js b/src/containers/settings/SettingsWindow.js index 8cbde24c1..663b9e2e4 100644 --- a/src/containers/settings/SettingsWindow.js +++ b/src/containers/settings/SettingsWindow.js | |||
@@ -7,7 +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 { workspacesState } from '../../features/workspaces/state'; | 10 | import { workspaceStore } from '../../features/workspaces'; |
11 | 11 | ||
12 | export default @inject('stores', 'actions') @observer class SettingsContainer extends Component { | 12 | export default @inject('stores', 'actions') @observer class SettingsContainer extends Component { |
13 | render() { | 13 | render() { |
@@ -17,7 +17,7 @@ export default @inject('stores', 'actions') @observer class SettingsContainer ex | |||
17 | const navigation = ( | 17 | const navigation = ( |
18 | <Navigation | 18 | <Navigation |
19 | serviceCount={stores.services.all.length} | 19 | serviceCount={stores.services.all.length} |
20 | workspaceCount={workspacesState.workspaces.length} | 20 | workspaceCount={workspaceStore.workspaces.length} |
21 | /> | 21 | /> |
22 | ); | 22 | ); |
23 | 23 | ||