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/features/workspaces/components | |
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/features/workspaces/components')
-rw-r--r-- | src/features/workspaces/components/WorkspaceDrawer.js | 11 | ||||
-rw-r--r-- | src/features/workspaces/components/WorkspaceSwitchingIndicator.js | 4 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/features/workspaces/components/WorkspaceDrawer.js b/src/features/workspaces/components/WorkspaceDrawer.js index c18eb0e11..6dc779be9 100644 --- a/src/features/workspaces/components/WorkspaceDrawer.js +++ b/src/features/workspaces/components/WorkspaceDrawer.js | |||
@@ -6,9 +6,9 @@ import { defineMessages, intlShape } from 'react-intl'; | |||
6 | import { H1, Icon } from '@meetfranz/ui'; | 6 | import { H1, Icon } from '@meetfranz/ui'; |
7 | import ReactTooltip from 'react-tooltip'; | 7 | import ReactTooltip from 'react-tooltip'; |
8 | 8 | ||
9 | import { workspacesState } from '../state'; | ||
10 | import WorkspaceDrawerItem from './WorkspaceDrawerItem'; | 9 | import WorkspaceDrawerItem from './WorkspaceDrawerItem'; |
11 | import { workspaceActions } from '../actions'; | 10 | import { workspaceActions } from '../actions'; |
11 | import { workspaceStore } from '../index'; | ||
12 | 12 | ||
13 | const messages = defineMessages({ | 13 | const messages = defineMessages({ |
14 | headline: { | 14 | headline: { |
@@ -70,7 +70,12 @@ class WorkspaceDrawer extends Component { | |||
70 | getServicesForWorkspace, | 70 | getServicesForWorkspace, |
71 | } = this.props; | 71 | } = this.props; |
72 | const { intl } = this.context; | 72 | const { intl } = this.context; |
73 | const { activeWorkspace, isSwitchingWorkspace, nextWorkspace } = workspacesState; | 73 | const { |
74 | activeWorkspace, | ||
75 | isSwitchingWorkspace, | ||
76 | nextWorkspace, | ||
77 | workspaces, | ||
78 | } = workspaceStore; | ||
74 | const actualWorkspace = isSwitchingWorkspace ? nextWorkspace : activeWorkspace; | 79 | const actualWorkspace = isSwitchingWorkspace ? nextWorkspace : activeWorkspace; |
75 | return ( | 80 | return ( |
76 | <div className={classes.drawer}> | 81 | <div className={classes.drawer}> |
@@ -95,7 +100,7 @@ class WorkspaceDrawer extends Component { | |||
95 | services={getServicesForWorkspace(null)} | 100 | services={getServicesForWorkspace(null)} |
96 | isActive={actualWorkspace == null} | 101 | isActive={actualWorkspace == null} |
97 | /> | 102 | /> |
98 | {workspacesState.workspaces.map(workspace => ( | 103 | {workspaces.map(workspace => ( |
99 | <WorkspaceDrawerItem | 104 | <WorkspaceDrawerItem |
100 | key={workspace.id} | 105 | key={workspace.id} |
101 | name={workspace.name} | 106 | name={workspace.name} |
diff --git a/src/features/workspaces/components/WorkspaceSwitchingIndicator.js b/src/features/workspaces/components/WorkspaceSwitchingIndicator.js index 68ce6fd87..c012ab008 100644 --- a/src/features/workspaces/components/WorkspaceSwitchingIndicator.js +++ b/src/features/workspaces/components/WorkspaceSwitchingIndicator.js | |||
@@ -5,8 +5,8 @@ import injectSheet from 'react-jss'; | |||
5 | import classnames from 'classnames'; | 5 | import classnames from 'classnames'; |
6 | import { defineMessages, intlShape } from 'react-intl'; | 6 | import { defineMessages, intlShape } from 'react-intl'; |
7 | 7 | ||
8 | import { workspacesState } from '../state'; | ||
9 | import LoaderComponent from '../../../components/ui/Loader'; | 8 | import LoaderComponent from '../../../components/ui/Loader'; |
9 | import { workspaceStore } from '../index'; | ||
10 | 10 | ||
11 | const messages = defineMessages({ | 11 | const messages = defineMessages({ |
12 | switchingTo: { | 12 | switchingTo: { |
@@ -56,7 +56,7 @@ class WorkspaceSwitchingIndicator extends Component { | |||
56 | render() { | 56 | render() { |
57 | const { classes } = this.props; | 57 | const { classes } = this.props; |
58 | const { intl } = this.context; | 58 | const { intl } = this.context; |
59 | const { isSwitchingWorkspace, isWorkspaceDrawerOpen, nextWorkspace } = workspacesState; | 59 | const { isSwitchingWorkspace, isWorkspaceDrawerOpen, nextWorkspace } = workspaceStore; |
60 | if (!isSwitchingWorkspace) return null; | 60 | if (!isSwitchingWorkspace) return null; |
61 | const nextWorkspaceName = nextWorkspace ? nextWorkspace.name : 'All services'; | 61 | const nextWorkspaceName = nextWorkspace ? nextWorkspace.name : 'All services'; |
62 | return ( | 62 | return ( |