diff options
5 files changed, 50 insertions, 3 deletions
diff --git a/src/features/workspaces/components/WorkspaceDrawerItem.js b/src/features/workspaces/components/WorkspaceDrawerItem.js index d2cdf1c0a..1e28ebea6 100644 --- a/src/features/workspaces/components/WorkspaceDrawerItem.js +++ b/src/features/workspaces/components/WorkspaceDrawerItem.js | |||
@@ -3,6 +3,14 @@ import PropTypes from 'prop-types'; | |||
3 | import { observer } from 'mobx-react'; | 3 | import { observer } from 'mobx-react'; |
4 | import injectSheet from 'react-jss'; | 4 | import injectSheet from 'react-jss'; |
5 | import classnames from 'classnames'; | 5 | import classnames from 'classnames'; |
6 | import { defineMessages, intlShape } from 'react-intl'; | ||
7 | |||
8 | const messages = defineMessages({ | ||
9 | noServicesAddedYet: { | ||
10 | id: 'workspaceDrawer.item.noServicesAddedYet', | ||
11 | defaultMessage: '!!!No services added yet', | ||
12 | }, | ||
13 | }); | ||
6 | 14 | ||
7 | const styles = theme => ({ | 15 | const styles = theme => ({ |
8 | item: { | 16 | item: { |
@@ -48,6 +56,10 @@ class WorkspaceDrawerItem extends Component { | |||
48 | services: PropTypes.arrayOf(PropTypes.string).isRequired, | 56 | services: PropTypes.arrayOf(PropTypes.string).isRequired, |
49 | }; | 57 | }; |
50 | 58 | ||
59 | static contextTypes = { | ||
60 | intl: intlShape, | ||
61 | }; | ||
62 | |||
51 | render() { | 63 | render() { |
52 | const { | 64 | const { |
53 | classes, | 65 | classes, |
@@ -56,6 +68,7 @@ class WorkspaceDrawerItem extends Component { | |||
56 | onClick, | 68 | onClick, |
57 | services, | 69 | services, |
58 | } = this.props; | 70 | } = this.props; |
71 | const { intl } = this.context; | ||
59 | return ( | 72 | return ( |
60 | <div | 73 | <div |
61 | className={classnames([ | 74 | className={classnames([ |
@@ -78,7 +91,7 @@ class WorkspaceDrawerItem extends Component { | |||
78 | isActive ? classes.activeServices : null, | 91 | isActive ? classes.activeServices : null, |
79 | ])} | 92 | ])} |
80 | > | 93 | > |
81 | {services.join(', ')} | 94 | {services.length ? services.join(', ') : intl.formatMessage(messages.noServicesAddedYet)} |
82 | </span> | 95 | </span> |
83 | </div> | 96 | </div> |
84 | ); | 97 | ); |
diff --git a/src/features/workspaces/containers/WorkspacesScreen.js b/src/features/workspaces/containers/WorkspacesScreen.js index 99241210e..bd1ddcd43 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.isLoadingWorkspaces} | 24 | isLoadingWorkspaces={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/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index 9171c3592..c1634df8e 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json | |||
@@ -3354,6 +3354,24 @@ | |||
3354 | { | 3354 | { |
3355 | "descriptors": [ | 3355 | "descriptors": [ |
3356 | { | 3356 | { |
3357 | "defaultMessage": "!!!No services added yet", | ||
3358 | "end": { | ||
3359 | "column": 3, | ||
3360 | "line": 12 | ||
3361 | }, | ||
3362 | "file": "src/features/workspaces/components/WorkspaceDrawerItem.js", | ||
3363 | "id": "workspaceDrawer.item.noServicesAddedYet", | ||
3364 | "start": { | ||
3365 | "column": 22, | ||
3366 | "line": 9 | ||
3367 | } | ||
3368 | } | ||
3369 | ], | ||
3370 | "path": "src/features/workspaces/components/WorkspaceDrawerItem.json" | ||
3371 | }, | ||
3372 | { | ||
3373 | "descriptors": [ | ||
3374 | { | ||
3357 | "defaultMessage": "!!!Your workspaces", | 3375 | "defaultMessage": "!!!Your workspaces", |
3358 | "end": { | 3376 | "end": { |
3359 | "column": 3, | 3377 | "column": 3, |
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index 231e8f261..f37237ac2 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json | |||
@@ -302,5 +302,6 @@ | |||
302 | "welcome.signupButton": "Create a free account", | 302 | "welcome.signupButton": "Create a free account", |
303 | "workspaceDrawer.allServices": "All services", | 303 | "workspaceDrawer.allServices": "All services", |
304 | "workspaceDrawer.headline": "Workspaces", | 304 | "workspaceDrawer.headline": "Workspaces", |
305 | "workspaceDrawer.item.noServicesAddedYet": "No services added yet", | ||
305 | "workspaces.switchingIndicator.switchingTo": "Switching to" | 306 | "workspaces.switchingIndicator.switchingTo": "Switching to" |
306 | } \ No newline at end of file | 307 | } |
diff --git a/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawerItem.json b/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawerItem.json new file mode 100644 index 000000000..cdbd1d5b5 --- /dev/null +++ b/src/i18n/messages/src/features/workspaces/components/WorkspaceDrawerItem.json | |||
@@ -0,0 +1,15 @@ | |||
1 | [ | ||
2 | { | ||
3 | "id": "workspaceDrawer.item.noServicesAddedYet", | ||
4 | "defaultMessage": "!!!No services added yet", | ||
5 | "file": "src/features/workspaces/components/WorkspaceDrawerItem.js", | ||
6 | "start": { | ||
7 | "line": 9, | ||
8 | "column": 22 | ||
9 | }, | ||
10 | "end": { | ||
11 | "line": 12, | ||
12 | "column": 3 | ||
13 | } | ||
14 | } | ||
15 | ] \ No newline at end of file | ||