small fixes

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';
 import { observer } from 'mobx-react';
 import injectSheet from 'react-jss';
 import classnames from 'classnames';
+import { defineMessages, intlShape } from 'react-intl';
+
+const messages = defineMessages({
+  noServicesAddedYet: {
+    id: 'workspaceDrawer.item.noServicesAddedYet',
+    defaultMessage: '!!!No services added yet',
+  },
+});
 
 const styles = theme => ({
   item: {
@@ -48,6 +56,10 @@ class WorkspaceDrawerItem extends Component {
     services: PropTypes.arrayOf(PropTypes.string).isRequired,
   };
 
+  static contextTypes = {
+    intl: intlShape,
+  };
+
   render() {
     const {
       classes,
@@ -56,6 +68,7 @@ class WorkspaceDrawerItem extends Component {
       onClick,
       services,
     } = this.props;
+    const { intl } = this.context;
     return (
       <div
         className={classnames([
@@ -78,7 +91,7 @@ class WorkspaceDrawerItem extends Component {
             isActive ? classes.activeServices : null,
           ])}
         >
-          {services.join(', ')}
+          {services.length ? services.join(', ') : intl.formatMessage(messages.noServicesAddedYet)}
         </span>
       </div>
     );
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 {
       <ErrorBoundary>
         <WorkspacesDashboard
           workspaces={workspacesState.workspaces}
-          isLoading={workspacesState.isLoadingWorkspaces}
+          isLoadingWorkspaces={workspacesState.isLoadingWorkspaces}
           onCreateWorkspaceSubmit={data => actions.workspaces.create(data)}
           onWorkspaceClick={w => actions.workspaces.edit({ workspace: w })}
         />
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 @@
   {
     "descriptors": [
       {
+        "defaultMessage": "!!!No services added yet",
+        "end": {
+          "column": 3,
+          "line": 12
+        },
+        "file": "src/features/workspaces/components/WorkspaceDrawerItem.js",
+        "id": "workspaceDrawer.item.noServicesAddedYet",
+        "start": {
+          "column": 22,
+          "line": 9
+        }
+      }
+    ],
+    "path": "src/features/workspaces/components/WorkspaceDrawerItem.json"
+  },
+  {
+    "descriptors": [
+      {
         "defaultMessage": "!!!Your workspaces",
         "end": {
           "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 @@
   "welcome.signupButton": "Create a free account",
   "workspaceDrawer.allServices": "All services",
   "workspaceDrawer.headline": "Workspaces",
+  "workspaceDrawer.item.noServicesAddedYet": "No services added yet",
   "workspaces.switchingIndicator.switchingTo": "Switching to"
-}
\ No newline at end of file
+}
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 @@
+[
+  {
+    "id": "workspaceDrawer.item.noServicesAddedYet",
+    "defaultMessage": "!!!No services added yet",
+    "file": "src/features/workspaces/components/WorkspaceDrawerItem.js",
+    "start": {
+      "line": 9,
+      "column": 22
+    },
+    "end": {
+      "line": 12,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file