hide workspace feature if it is disabled

2 files changed, 26 insertions, 20 deletions

diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index de379875e..f7bacfe0f 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -6,6 +6,7 @@ import { observer } from 'mobx-react';
 
 import Tabbar from '../services/tabs/Tabbar';
 import { ctrlKey } from '../../environment';
+import { workspaceStore } from '../../features/workspaces';
 
 const messages = defineMessages({
   settings: {
@@ -88,17 +89,19 @@ export default @observer class Sidebar extends Component {
           enableToolTip={() => this.enableToolTip()}
           disableToolTip={() => this.disableToolTip()}
         />
-        <button
-          type="button"
-          onClick={() => {
-            toggleWorkspaceDrawer();
-            this.updateToolTip();
-          }}
-          className={`sidebar__button sidebar__button--workspaces ${isWorkspaceDrawerOpen ? 'is-active' : ''}`}
-          data-tip={`${intl.formatMessage(workspaceToggleMessage)} (${ctrlKey}+Shift+D)`}
-        >
-          <i className="mdi mdi-view-grid" />
-        </button>
+        {workspaceStore.isFeatureActive ? (
+          <button
+            type="button"
+            onClick={() => {
+              toggleWorkspaceDrawer();
+              this.updateToolTip();
+            }}
+            className={`sidebar__button sidebar__button--workspaces ${isWorkspaceDrawerOpen ? 'is-active' : ''}`}
+            data-tip={`${intl.formatMessage(workspaceToggleMessage)} (${ctrlKey}+Shift+D)`}
+          >
+            <i className="mdi mdi-view-grid" />
+          </button>
+        ) : null}
         <button
           type="button"
           onClick={() => {
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js
index 3f570f3b6..a0eb7d796 100644
--- a/src/components/settings/navigation/SettingsNavigation.js
+++ b/src/components/settings/navigation/SettingsNavigation.js
@@ -4,6 +4,7 @@ import { defineMessages, intlShape } from 'react-intl';
 import { inject, observer } from 'mobx-react';
 
 import Link from '../../ui/Link';
+import { workspaceStore } from '../../../features/workspaces';
 
 const messages = defineMessages({
   availableServices: {
@@ -68,15 +69,17 @@ export default @inject('stores') @observer class SettingsNavigation extends Comp
           {' '}
           <span className="badge">{serviceCount}</span>
         </Link>
-        <Link
-          to="/settings/workspaces"
-          className="settings-navigation__link"
-          activeClassName="is-active"
-        >
-          {intl.formatMessage(messages.yourWorkspaces)}
-          {' '}
-          <span className="badge">{workspaceCount}</span>
-        </Link>
+        {workspaceStore.isFeatureActive ? (
+          <Link
+            to="/settings/workspaces"
+            className="settings-navigation__link"
+            activeClassName="is-active"
+          >
+            {intl.formatMessage(messages.yourWorkspaces)}
+            {' '}
+            <span className="badge">{workspaceCount}</span>
+          </Link>
+        ) : null}
         <Link
           to="/settings/user"
           className="settings-navigation__link"