aboutsummaryrefslogtreecommitdiffstats
path: root/src/containers
diff options
context:
space:
mode:
authorLibravatar Dominik Guzei <dominik.guzei@gmail.com>2019-03-23 14:15:57 +0100
committerLibravatar Dominik Guzei <dominik.guzei@gmail.com>2019-03-23 14:15:57 +0100
commit0af622e6e81a5aee64f839eeadd23b4a62b3cf62 (patch)
tree0e2264b83c3f57f2850062f6b7293bf06416bb49 /src/containers
parentfix merge conflicts with latest develop (diff)
downloadferdium-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.js4
-rw-r--r--src/containers/settings/SettingsWindow.js4
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';
20import AppLoader from '../../components/ui/AppLoader'; 20import AppLoader from '../../components/ui/AppLoader';
21 21
22import { state as delayAppState } from '../../features/delayApp'; 22import { state as delayAppState } from '../../features/delayApp';
23import { workspacesState } from '../../features/workspaces/state';
24import { workspaceActions } from '../../features/workspaces/actions'; 23import { workspaceActions } from '../../features/workspaces/actions';
25import WorkspaceDrawer from '../../features/workspaces/components/WorkspaceDrawer'; 24import WorkspaceDrawer from '../../features/workspaces/components/WorkspaceDrawer';
25import { workspaceStore } from '../../features/workspaces';
26 26
27export default @inject('stores', 'actions') @observer class AppLayoutContainer extends Component { 27export 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';
7import Layout from '../../components/settings/SettingsLayout'; 7import Layout from '../../components/settings/SettingsLayout';
8import Navigation from '../../components/settings/navigation/SettingsNavigation'; 8import Navigation from '../../components/settings/navigation/SettingsNavigation';
9import ErrorBoundary from '../../components/util/ErrorBoundary'; 9import ErrorBoundary from '../../components/util/ErrorBoundary';
10import { workspacesState } from '../../features/workspaces/state'; 10import { workspaceStore } from '../../features/workspaces';
11 11
12export default @inject('stores', 'actions') @observer class SettingsContainer extends Component { 12export 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