diff options
Diffstat (limited to 'src/features/workspaces')
-rw-r--r-- | src/features/workspaces/components/WorkspaceDrawer.js | 7 | ||||
-rw-r--r-- | src/features/workspaces/components/WorkspaceSwitchingIndicator.js | 56 | ||||
-rw-r--r-- | src/features/workspaces/components/WorkspacesDashboard.js | 4 | ||||
-rw-r--r-- | src/features/workspaces/containers/WorkspacesScreen.js | 2 | ||||
-rw-r--r-- | src/features/workspaces/index.js | 11 | ||||
-rw-r--r-- | src/features/workspaces/state.js | 4 | ||||
-rw-r--r-- | src/features/workspaces/store.js | 25 |
7 files changed, 93 insertions, 16 deletions
diff --git a/src/features/workspaces/components/WorkspaceDrawer.js b/src/features/workspaces/components/WorkspaceDrawer.js index 27bf08361..c9c4d3bc9 100644 --- a/src/features/workspaces/components/WorkspaceDrawer.js +++ b/src/features/workspaces/components/WorkspaceDrawer.js | |||
@@ -54,7 +54,8 @@ class WorkspaceDrawer extends Component { | |||
54 | getServicesForWorkspace, | 54 | getServicesForWorkspace, |
55 | } = this.props; | 55 | } = this.props; |
56 | const { intl } = this.context; | 56 | const { intl } = this.context; |
57 | 57 | const { activeWorkspace, isSwitchingWorkspace, nextWorkspace } = workspacesState; | |
58 | const actualWorkspace = isSwitchingWorkspace ? nextWorkspace : activeWorkspace; | ||
58 | return ( | 59 | return ( |
59 | <div className={classes.drawer}> | 60 | <div className={classes.drawer}> |
60 | <H1 className={classes.headline}> | 61 | <H1 className={classes.headline}> |
@@ -74,13 +75,13 @@ class WorkspaceDrawer extends Component { | |||
74 | name={intl.formatMessage(messages.allServices)} | 75 | name={intl.formatMessage(messages.allServices)} |
75 | onClick={() => workspaceActions.deactivate()} | 76 | onClick={() => workspaceActions.deactivate()} |
76 | services={getServicesForWorkspace(null)} | 77 | services={getServicesForWorkspace(null)} |
77 | isActive={workspacesState.activeWorkspace == null} | 78 | isActive={actualWorkspace == null} |
78 | /> | 79 | /> |
79 | {workspacesState.workspaces.map(workspace => ( | 80 | {workspacesState.workspaces.map(workspace => ( |
80 | <WorkspaceDrawerItem | 81 | <WorkspaceDrawerItem |
81 | key={workspace.id} | 82 | key={workspace.id} |
82 | name={workspace.name} | 83 | name={workspace.name} |
83 | isActive={workspacesState.activeWorkspace === workspace} | 84 | isActive={actualWorkspace === workspace} |
84 | onClick={() => workspaceActions.activate({ workspace })} | 85 | onClick={() => workspaceActions.activate({ workspace })} |
85 | services={getServicesForWorkspace(workspace)} | 86 | services={getServicesForWorkspace(workspace)} |
86 | /> | 87 | /> |
diff --git a/src/features/workspaces/components/WorkspaceSwitchingIndicator.js b/src/features/workspaces/components/WorkspaceSwitchingIndicator.js new file mode 100644 index 000000000..4a279afaf --- /dev/null +++ b/src/features/workspaces/components/WorkspaceSwitchingIndicator.js | |||
@@ -0,0 +1,56 @@ | |||
1 | import React, { Component } from 'react'; | ||
2 | import PropTypes from 'prop-types'; | ||
3 | import { observer } from 'mobx-react'; | ||
4 | import injectSheet from 'react-jss'; | ||
5 | import { workspacesState } from '../state'; | ||
6 | import LoaderComponent from '../../../components/ui/Loader'; | ||
7 | |||
8 | const styles = () => ({ | ||
9 | wrapper: { | ||
10 | display: 'flex', | ||
11 | alignItems: 'flex-start', | ||
12 | position: 'absolute', | ||
13 | width: '100%', | ||
14 | marginTop: '20px', | ||
15 | }, | ||
16 | component: { | ||
17 | background: 'rgba(20, 20, 20, 0.4)', | ||
18 | padding: 20, | ||
19 | width: 'auto', | ||
20 | height: 'auto', | ||
21 | margin: [0, 'auto'], | ||
22 | borderRadius: 6, | ||
23 | alignItems: 'flex-start', | ||
24 | zIndex: 200, | ||
25 | }, | ||
26 | name: { | ||
27 | fontSize: 35, | ||
28 | marginBottom: '10px', | ||
29 | }, | ||
30 | }); | ||
31 | |||
32 | @injectSheet(styles) @observer | ||
33 | class WorkspaceSwitchingIndicator extends Component { | ||
34 | static propTypes = { | ||
35 | classes: PropTypes.object.isRequired, | ||
36 | }; | ||
37 | |||
38 | render() { | ||
39 | const { classes } = this.props; | ||
40 | const { isSwitchingWorkspace, nextWorkspace } = workspacesState; | ||
41 | if (!isSwitchingWorkspace) return null; | ||
42 | const nextWorkspaceName = nextWorkspace ? nextWorkspace.name : 'All services'; | ||
43 | return ( | ||
44 | <div className={classes.wrapper}> | ||
45 | <div className={classes.component}> | ||
46 | <h1 className={classes.name}> | ||
47 | {`Switching to ${nextWorkspaceName}`} | ||
48 | </h1> | ||
49 | <LoaderComponent /> | ||
50 | </div> | ||
51 | </div> | ||
52 | ); | ||
53 | } | ||
54 | } | ||
55 | |||
56 | export default WorkspaceSwitchingIndicator; | ||
diff --git a/src/features/workspaces/components/WorkspacesDashboard.js b/src/features/workspaces/components/WorkspacesDashboard.js index 917807302..df35b3590 100644 --- a/src/features/workspaces/components/WorkspacesDashboard.js +++ b/src/features/workspaces/components/WorkspacesDashboard.js | |||
@@ -30,7 +30,7 @@ const styles = () => ({ | |||
30 | class WorkspacesDashboard extends Component { | 30 | class WorkspacesDashboard extends Component { |
31 | static propTypes = { | 31 | static propTypes = { |
32 | classes: PropTypes.object.isRequired, | 32 | classes: PropTypes.object.isRequired, |
33 | isLoading: PropTypes.bool.isRequired, | 33 | isLoadingWorkspaces: PropTypes.bool.isRequired, |
34 | onCreateWorkspaceSubmit: PropTypes.func.isRequired, | 34 | onCreateWorkspaceSubmit: PropTypes.func.isRequired, |
35 | onWorkspaceClick: PropTypes.func.isRequired, | 35 | onWorkspaceClick: PropTypes.func.isRequired, |
36 | workspaces: MobxPropTypes.arrayOrObservableArray.isRequired, | 36 | workspaces: MobxPropTypes.arrayOrObservableArray.isRequired, |
@@ -60,7 +60,7 @@ class WorkspacesDashboard extends Component { | |||
60 | <div className={classes.createForm}> | 60 | <div className={classes.createForm}> |
61 | <CreateWorkspaceForm onSubmit={onCreateWorkspaceSubmit} /> | 61 | <CreateWorkspaceForm onSubmit={onCreateWorkspaceSubmit} /> |
62 | </div> | 62 | </div> |
63 | {isLoading ? ( | 63 | {isLoadingWorkspaces ? ( |
64 | <Loader /> | 64 | <Loader /> |
65 | ) : ( | 65 | ) : ( |
66 | <table className="workspace-table"> | 66 | <table className="workspace-table"> |
diff --git a/src/features/workspaces/containers/WorkspacesScreen.js b/src/features/workspaces/containers/WorkspacesScreen.js index 94e714255..99241210e 100644 --- a/src/features/workspaces/containers/WorkspacesScreen.js +++ b/src/features/workspaces/containers/WorkspacesScreen.js | |||
@@ -21,7 +21,7 @@ class WorkspacesScreen extends Component { | |||
21 | <ErrorBoundary> | 21 | <ErrorBoundary> |
22 | <WorkspacesDashboard | 22 | <WorkspacesDashboard |
23 | workspaces={workspacesState.workspaces} | 23 | workspaces={workspacesState.workspaces} |
24 | isLoading={workspacesState.isLoading} | 24 | isLoading={workspacesState.isLoadingWorkspaces} |
25 | onCreateWorkspaceSubmit={data => actions.workspaces.create(data)} | 25 | onCreateWorkspaceSubmit={data => actions.workspaces.create(data)} |
26 | onWorkspaceClick={w => actions.workspaces.edit({ workspace: w })} | 26 | onWorkspaceClick={w => actions.workspaces.edit({ workspace: w })} |
27 | /> | 27 | /> |
diff --git a/src/features/workspaces/index.js b/src/features/workspaces/index.js index 26cadea64..1644c0e2f 100644 --- a/src/features/workspaces/index.js +++ b/src/features/workspaces/index.js | |||
@@ -8,10 +8,13 @@ const debug = require('debug')('Franz:feature:workspaces'); | |||
8 | let store = null; | 8 | let store = null; |
9 | 9 | ||
10 | export const filterServicesByActiveWorkspace = (services) => { | 10 | export const filterServicesByActiveWorkspace = (services) => { |
11 | const { isFeatureActive, activeWorkspace } = workspacesState; | 11 | const { |
12 | if (isFeatureActive && activeWorkspace) { | 12 | activeWorkspace, |
13 | return services.filter(s => activeWorkspace.services.includes(s.id)); | 13 | isFeatureActive, |
14 | } | 14 | } = workspacesState; |
15 | |||
16 | if (!isFeatureActive) return services; | ||
17 | if (activeWorkspace) return services.filter(s => activeWorkspace.services.includes(s.id)); | ||
15 | return services; | 18 | return services; |
16 | }; | 19 | }; |
17 | 20 | ||
diff --git a/src/features/workspaces/state.js b/src/features/workspaces/state.js index 68a7d8d91..c916480c0 100644 --- a/src/features/workspaces/state.js +++ b/src/features/workspaces/state.js | |||
@@ -2,8 +2,10 @@ import { observable } from 'mobx'; | |||
2 | 2 | ||
3 | const defaultState = { | 3 | const defaultState = { |
4 | activeWorkspace: null, | 4 | activeWorkspace: null, |
5 | isLoading: false, | 5 | nextWorkspace: null, |
6 | isLoadingWorkspaces: false, | ||
6 | isFeatureActive: false, | 7 | isFeatureActive: false, |
8 | isSwitchingWorkspace: false, | ||
7 | isWorkspaceDrawerOpen: false, | 9 | isWorkspaceDrawerOpen: false, |
8 | workspaces: [], | 10 | workspaces: [], |
9 | workspaceBeingEdited: null, | 11 | workspaceBeingEdited: null, |
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js index 1b57ba2da..f6b9b2ff4 100644 --- a/src/features/workspaces/store.js +++ b/src/features/workspaces/store.js | |||
@@ -31,7 +31,7 @@ export default class WorkspacesStore extends Store { | |||
31 | */ | 31 | */ |
32 | reaction( | 32 | reaction( |
33 | () => this.allWorkspacesRequest.isExecuting, | 33 | () => this.allWorkspacesRequest.isExecuting, |
34 | isExecuting => this._setIsLoading(isExecuting), | 34 | isExecuting => this._setIsLoadingWorkspaces(isExecuting), |
35 | ); | 35 | ); |
36 | /** | 36 | /** |
37 | * Update the state with the workspace to be edited when route matches. | 37 | * Update the state with the workspace to be edited when route matches. |
@@ -66,8 +66,8 @@ export default class WorkspacesStore extends Store { | |||
66 | this.state.workspaces = workspaces.map(data => new Workspace(data)); | 66 | this.state.workspaces = workspaces.map(data => new Workspace(data)); |
67 | }; | 67 | }; |
68 | 68 | ||
69 | @action _setIsLoading = (isLoading) => { | 69 | @action _setIsLoadingWorkspaces = (isLoading) => { |
70 | this.state.isLoading = isLoading; | 70 | this.state.isLoadingWorkspaces = isLoading; |
71 | }; | 71 | }; |
72 | 72 | ||
73 | @action _edit = ({ workspace }) => { | 73 | @action _edit = ({ workspace }) => { |
@@ -107,11 +107,26 @@ export default class WorkspacesStore extends Store { | |||
107 | }; | 107 | }; |
108 | 108 | ||
109 | @action _setActiveWorkspace = ({ workspace }) => { | 109 | @action _setActiveWorkspace = ({ workspace }) => { |
110 | this.state.activeWorkspace = workspace; | 110 | Object.assign(this.state, { |
111 | isSwitchingWorkspace: true, | ||
112 | nextWorkspace: workspace, | ||
113 | }); | ||
114 | setTimeout(() => { this.state.activeWorkspace = workspace; }, 100); | ||
115 | setTimeout(() => { | ||
116 | Object.assign(this.state, { | ||
117 | isSwitchingWorkspace: false, | ||
118 | nextWorkspace: null, | ||
119 | }); | ||
120 | }, 1000); | ||
111 | }; | 121 | }; |
112 | 122 | ||
113 | @action _deactivateActiveWorkspace = () => { | 123 | @action _deactivateActiveWorkspace = () => { |
114 | this.state.activeWorkspace = null; | 124 | Object.assign(this.state, { |
125 | isSwitchingWorkspace: true, | ||
126 | nextWorkspace: null, | ||
127 | }); | ||
128 | setTimeout(() => { this.state.activeWorkspace = null; }, 100); | ||
129 | setTimeout(() => { this.state.isSwitchingWorkspace = false; }, 1000); | ||
115 | }; | 130 | }; |
116 | 131 | ||
117 | @action _toggleWorkspaceDrawer = () => { | 132 | @action _toggleWorkspaceDrawer = () => { |