diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/components/layout/Sidebar.js | 25 | ||||
-rw-r--r-- | src/components/settings/navigation/SettingsNavigation.js | 21 | ||||
-rw-r--r-- | src/config.js | 2 | ||||
-rw-r--r-- | src/features/workspaces/store.js | 5 | ||||
-rw-r--r-- | src/i18n/locales/defaultMessages.json | 52 | ||||
-rw-r--r-- | src/i18n/messages/src/components/layout/Sidebar.json | 24 | ||||
-rw-r--r-- | src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json | 28 | ||||
-rw-r--r-- | src/lib/Menu.js | 6 | ||||
-rw-r--r-- | src/stores/FeaturesStore.js | 4 |
9 files changed, 90 insertions, 77 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'; | |||
6 | 6 | ||
7 | import Tabbar from '../services/tabs/Tabbar'; | 7 | import Tabbar from '../services/tabs/Tabbar'; |
8 | import { ctrlKey } from '../../environment'; | 8 | import { ctrlKey } from '../../environment'; |
9 | import { workspaceStore } from '../../features/workspaces'; | ||
9 | 10 | ||
10 | const messages = defineMessages({ | 11 | const messages = defineMessages({ |
11 | settings: { | 12 | settings: { |
@@ -88,17 +89,19 @@ export default @observer class Sidebar extends Component { | |||
88 | enableToolTip={() => this.enableToolTip()} | 89 | enableToolTip={() => this.enableToolTip()} |
89 | disableToolTip={() => this.disableToolTip()} | 90 | disableToolTip={() => this.disableToolTip()} |
90 | /> | 91 | /> |
91 | <button | 92 | {workspaceStore.isFeatureActive ? ( |
92 | type="button" | 93 | <button |
93 | onClick={() => { | 94 | type="button" |
94 | toggleWorkspaceDrawer(); | 95 | onClick={() => { |
95 | this.updateToolTip(); | 96 | toggleWorkspaceDrawer(); |
96 | }} | 97 | this.updateToolTip(); |
97 | className={`sidebar__button sidebar__button--workspaces ${isWorkspaceDrawerOpen ? 'is-active' : ''}`} | 98 | }} |
98 | data-tip={`${intl.formatMessage(workspaceToggleMessage)} (${ctrlKey}+Shift+D)`} | 99 | className={`sidebar__button sidebar__button--workspaces ${isWorkspaceDrawerOpen ? 'is-active' : ''}`} |
99 | > | 100 | data-tip={`${intl.formatMessage(workspaceToggleMessage)} (${ctrlKey}+Shift+D)`} |
100 | <i className="mdi mdi-view-grid" /> | 101 | > |
101 | </button> | 102 | <i className="mdi mdi-view-grid" /> |
103 | </button> | ||
104 | ) : null} | ||
102 | <button | 105 | <button |
103 | type="button" | 106 | type="button" |
104 | onClick={() => { | 107 | 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'; | |||
4 | import { inject, observer } from 'mobx-react'; | 4 | import { inject, observer } from 'mobx-react'; |
5 | 5 | ||
6 | import Link from '../../ui/Link'; | 6 | import Link from '../../ui/Link'; |
7 | import { workspaceStore } from '../../../features/workspaces'; | ||
7 | 8 | ||
8 | const messages = defineMessages({ | 9 | const messages = defineMessages({ |
9 | availableServices: { | 10 | availableServices: { |
@@ -68,15 +69,17 @@ export default @inject('stores') @observer class SettingsNavigation extends Comp | |||
68 | {' '} | 69 | {' '} |
69 | <span className="badge">{serviceCount}</span> | 70 | <span className="badge">{serviceCount}</span> |
70 | </Link> | 71 | </Link> |
71 | <Link | 72 | {workspaceStore.isFeatureActive ? ( |
72 | to="/settings/workspaces" | 73 | <Link |
73 | className="settings-navigation__link" | 74 | to="/settings/workspaces" |
74 | activeClassName="is-active" | 75 | className="settings-navigation__link" |
75 | > | 76 | activeClassName="is-active" |
76 | {intl.formatMessage(messages.yourWorkspaces)} | 77 | > |
77 | {' '} | 78 | {intl.formatMessage(messages.yourWorkspaces)} |
78 | <span className="badge">{workspaceCount}</span> | 79 | {' '} |
79 | </Link> | 80 | <span className="badge">{workspaceCount}</span> |
81 | </Link> | ||
82 | ) : null} | ||
80 | <Link | 83 | <Link |
81 | to="/settings/user" | 84 | to="/settings/user" |
82 | className="settings-navigation__link" | 85 | className="settings-navigation__link" |
diff --git a/src/config.js b/src/config.js index d619a7492..242675762 100644 --- a/src/config.js +++ b/src/config.js | |||
@@ -42,7 +42,7 @@ export const DEFAULT_FEATURES_CONFIG = { | |||
42 | isServiceProxyEnabled: false, | 42 | isServiceProxyEnabled: false, |
43 | isServiceProxyPremiumFeature: true, | 43 | isServiceProxyPremiumFeature: true, |
44 | isWorkspacePremiumFeature: true, | 44 | isWorkspacePremiumFeature: true, |
45 | isWorkspaceEnabled: true, | 45 | isWorkspaceEnabled: false, |
46 | }; | 46 | }; |
47 | 47 | ||
48 | export const DEFAULT_WINDOW_OPTIONS = { | 48 | export const DEFAULT_WINDOW_OPTIONS = { |
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js index dbb1d7b05..86a8a2c76 100644 --- a/src/features/workspaces/store.js +++ b/src/features/workspaces/store.js | |||
@@ -63,6 +63,11 @@ export default class WorkspacesStore { | |||
63 | debug('WorkspacesStore::stop'); | 63 | debug('WorkspacesStore::stop'); |
64 | this._reactions.forEach(r => r.stop()); | 64 | this._reactions.forEach(r => r.stop()); |
65 | this.isFeatureActive = false; | 65 | this.isFeatureActive = false; |
66 | this.activeWorkspace = null; | ||
67 | this.nextWorkspace = null; | ||
68 | this.workspaceBeingEdited = null; | ||
69 | this.isSwitchingWorkspace = false; | ||
70 | this.isWorkspaceDrawerOpen = false; | ||
66 | } | 71 | } |
67 | 72 | ||
68 | filterServicesByActiveWorkspace = (services) => { | 73 | filterServicesByActiveWorkspace = (services) => { |
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index 480f5c6cb..03e96fc40 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json | |||
@@ -708,78 +708,78 @@ | |||
708 | "defaultMessage": "!!!Settings", | 708 | "defaultMessage": "!!!Settings", |
709 | "end": { | 709 | "end": { |
710 | "column": 3, | 710 | "column": 3, |
711 | "line": 14 | 711 | "line": 15 |
712 | }, | 712 | }, |
713 | "file": "src/components/layout/Sidebar.js", | 713 | "file": "src/components/layout/Sidebar.js", |
714 | "id": "sidebar.settings", | 714 | "id": "sidebar.settings", |
715 | "start": { | 715 | "start": { |
716 | "column": 12, | 716 | "column": 12, |
717 | "line": 11 | 717 | "line": 12 |
718 | } | 718 | } |
719 | }, | 719 | }, |
720 | { | 720 | { |
721 | "defaultMessage": "!!!Add new service", | 721 | "defaultMessage": "!!!Add new service", |
722 | "end": { | 722 | "end": { |
723 | "column": 3, | 723 | "column": 3, |
724 | "line": 18 | 724 | "line": 19 |
725 | }, | 725 | }, |
726 | "file": "src/components/layout/Sidebar.js", | 726 | "file": "src/components/layout/Sidebar.js", |
727 | "id": "sidebar.addNewService", | 727 | "id": "sidebar.addNewService", |
728 | "start": { | 728 | "start": { |
729 | "column": 17, | 729 | "column": 17, |
730 | "line": 15 | 730 | "line": 16 |
731 | } | 731 | } |
732 | }, | 732 | }, |
733 | { | 733 | { |
734 | "defaultMessage": "!!!Disable notifications & audio", | 734 | "defaultMessage": "!!!Disable notifications & audio", |
735 | "end": { | 735 | "end": { |
736 | "column": 3, | 736 | "column": 3, |
737 | "line": 22 | 737 | "line": 23 |
738 | }, | 738 | }, |
739 | "file": "src/components/layout/Sidebar.js", | 739 | "file": "src/components/layout/Sidebar.js", |
740 | "id": "sidebar.muteApp", | 740 | "id": "sidebar.muteApp", |
741 | "start": { | 741 | "start": { |
742 | "column": 8, | 742 | "column": 8, |
743 | "line": 19 | 743 | "line": 20 |
744 | } | 744 | } |
745 | }, | 745 | }, |
746 | { | 746 | { |
747 | "defaultMessage": "!!!Enable notifications & audio", | 747 | "defaultMessage": "!!!Enable notifications & audio", |
748 | "end": { | 748 | "end": { |
749 | "column": 3, | 749 | "column": 3, |
750 | "line": 26 | 750 | "line": 27 |
751 | }, | 751 | }, |
752 | "file": "src/components/layout/Sidebar.js", | 752 | "file": "src/components/layout/Sidebar.js", |
753 | "id": "sidebar.unmuteApp", | 753 | "id": "sidebar.unmuteApp", |
754 | "start": { | 754 | "start": { |
755 | "column": 10, | 755 | "column": 10, |
756 | "line": 23 | 756 | "line": 24 |
757 | } | 757 | } |
758 | }, | 758 | }, |
759 | { | 759 | { |
760 | "defaultMessage": "!!!Open workspace drawer", | 760 | "defaultMessage": "!!!Open workspace drawer", |
761 | "end": { | 761 | "end": { |
762 | "column": 3, | 762 | "column": 3, |
763 | "line": 30 | 763 | "line": 31 |
764 | }, | 764 | }, |
765 | "file": "src/components/layout/Sidebar.js", | 765 | "file": "src/components/layout/Sidebar.js", |
766 | "id": "sidebar.openWorkspaceDrawer", | 766 | "id": "sidebar.openWorkspaceDrawer", |
767 | "start": { | 767 | "start": { |
768 | "column": 23, | 768 | "column": 23, |
769 | "line": 27 | 769 | "line": 28 |
770 | } | 770 | } |
771 | }, | 771 | }, |
772 | { | 772 | { |
773 | "defaultMessage": "!!!Close workspace drawer", | 773 | "defaultMessage": "!!!Close workspace drawer", |
774 | "end": { | 774 | "end": { |
775 | "column": 3, | 775 | "column": 3, |
776 | "line": 34 | 776 | "line": 35 |
777 | }, | 777 | }, |
778 | "file": "src/components/layout/Sidebar.js", | 778 | "file": "src/components/layout/Sidebar.js", |
779 | "id": "sidebar.closeWorkspaceDrawer", | 779 | "id": "sidebar.closeWorkspaceDrawer", |
780 | "start": { | 780 | "start": { |
781 | "column": 24, | 781 | "column": 24, |
782 | "line": 31 | 782 | "line": 32 |
783 | } | 783 | } |
784 | } | 784 | } |
785 | ], | 785 | ], |
@@ -1302,91 +1302,91 @@ | |||
1302 | "defaultMessage": "!!!Available services", | 1302 | "defaultMessage": "!!!Available services", |
1303 | "end": { | 1303 | "end": { |
1304 | "column": 3, | 1304 | "column": 3, |
1305 | "line": 12 | 1305 | "line": 13 |
1306 | }, | 1306 | }, |
1307 | "file": "src/components/settings/navigation/SettingsNavigation.js", | 1307 | "file": "src/components/settings/navigation/SettingsNavigation.js", |
1308 | "id": "settings.navigation.availableServices", | 1308 | "id": "settings.navigation.availableServices", |
1309 | "start": { | 1309 | "start": { |
1310 | "column": 21, | 1310 | "column": 21, |
1311 | "line": 9 | 1311 | "line": 10 |
1312 | } | 1312 | } |
1313 | }, | 1313 | }, |
1314 | { | 1314 | { |
1315 | "defaultMessage": "!!!Your services", | 1315 | "defaultMessage": "!!!Your services", |
1316 | "end": { | 1316 | "end": { |
1317 | "column": 3, | 1317 | "column": 3, |
1318 | "line": 16 | 1318 | "line": 17 |
1319 | }, | 1319 | }, |
1320 | "file": "src/components/settings/navigation/SettingsNavigation.js", | 1320 | "file": "src/components/settings/navigation/SettingsNavigation.js", |
1321 | "id": "settings.navigation.yourServices", | 1321 | "id": "settings.navigation.yourServices", |
1322 | "start": { | 1322 | "start": { |
1323 | "column": 16, | 1323 | "column": 16, |
1324 | "line": 13 | 1324 | "line": 14 |
1325 | } | 1325 | } |
1326 | }, | 1326 | }, |
1327 | { | 1327 | { |
1328 | "defaultMessage": "!!!Your workspaces", | 1328 | "defaultMessage": "!!!Your workspaces", |
1329 | "end": { | 1329 | "end": { |
1330 | "column": 3, | 1330 | "column": 3, |
1331 | "line": 20 | 1331 | "line": 21 |
1332 | }, | 1332 | }, |
1333 | "file": "src/components/settings/navigation/SettingsNavigation.js", | 1333 | "file": "src/components/settings/navigation/SettingsNavigation.js", |
1334 | "id": "settings.navigation.yourWorkspaces", | 1334 | "id": "settings.navigation.yourWorkspaces", |
1335 | "start": { | 1335 | "start": { |
1336 | "column": 18, | 1336 | "column": 18, |
1337 | "line": 17 | 1337 | "line": 18 |
1338 | } | 1338 | } |
1339 | }, | 1339 | }, |
1340 | { | 1340 | { |
1341 | "defaultMessage": "!!!Account", | 1341 | "defaultMessage": "!!!Account", |
1342 | "end": { | 1342 | "end": { |
1343 | "column": 3, | 1343 | "column": 3, |
1344 | "line": 24 | 1344 | "line": 25 |
1345 | }, | 1345 | }, |
1346 | "file": "src/components/settings/navigation/SettingsNavigation.js", | 1346 | "file": "src/components/settings/navigation/SettingsNavigation.js", |
1347 | "id": "settings.navigation.account", | 1347 | "id": "settings.navigation.account", |
1348 | "start": { | 1348 | "start": { |
1349 | "column": 11, | 1349 | "column": 11, |
1350 | "line": 21 | 1350 | "line": 22 |
1351 | } | 1351 | } |
1352 | }, | 1352 | }, |
1353 | { | 1353 | { |
1354 | "defaultMessage": "!!!Settings", | 1354 | "defaultMessage": "!!!Settings", |
1355 | "end": { | 1355 | "end": { |
1356 | "column": 3, | 1356 | "column": 3, |
1357 | "line": 28 | 1357 | "line": 29 |
1358 | }, | 1358 | }, |
1359 | "file": "src/components/settings/navigation/SettingsNavigation.js", | 1359 | "file": "src/components/settings/navigation/SettingsNavigation.js", |
1360 | "id": "settings.navigation.settings", | 1360 | "id": "settings.navigation.settings", |
1361 | "start": { | 1361 | "start": { |
1362 | "column": 12, | 1362 | "column": 12, |
1363 | "line": 25 | 1363 | "line": 26 |
1364 | } | 1364 | } |
1365 | }, | 1365 | }, |
1366 | { | 1366 | { |
1367 | "defaultMessage": "!!!Invite Friends", | 1367 | "defaultMessage": "!!!Invite Friends", |
1368 | "end": { | 1368 | "end": { |
1369 | "column": 3, | 1369 | "column": 3, |
1370 | "line": 32 | 1370 | "line": 33 |
1371 | }, | 1371 | }, |
1372 | "file": "src/components/settings/navigation/SettingsNavigation.js", | 1372 | "file": "src/components/settings/navigation/SettingsNavigation.js", |
1373 | "id": "settings.navigation.inviteFriends", | 1373 | "id": "settings.navigation.inviteFriends", |
1374 | "start": { | 1374 | "start": { |
1375 | "column": 17, | 1375 | "column": 17, |
1376 | "line": 29 | 1376 | "line": 30 |
1377 | } | 1377 | } |
1378 | }, | 1378 | }, |
1379 | { | 1379 | { |
1380 | "defaultMessage": "!!!Logout", | 1380 | "defaultMessage": "!!!Logout", |
1381 | "end": { | 1381 | "end": { |
1382 | "column": 3, | 1382 | "column": 3, |
1383 | "line": 36 | 1383 | "line": 37 |
1384 | }, | 1384 | }, |
1385 | "file": "src/components/settings/navigation/SettingsNavigation.js", | 1385 | "file": "src/components/settings/navigation/SettingsNavigation.js", |
1386 | "id": "settings.navigation.logout", | 1386 | "id": "settings.navigation.logout", |
1387 | "start": { | 1387 | "start": { |
1388 | "column": 10, | 1388 | "column": 10, |
1389 | "line": 33 | 1389 | "line": 34 |
1390 | } | 1390 | } |
1391 | } | 1391 | } |
1392 | ], | 1392 | ], |
diff --git a/src/i18n/messages/src/components/layout/Sidebar.json b/src/i18n/messages/src/components/layout/Sidebar.json index 0254af8da..8fc508f71 100644 --- a/src/i18n/messages/src/components/layout/Sidebar.json +++ b/src/i18n/messages/src/components/layout/Sidebar.json | |||
@@ -4,11 +4,11 @@ | |||
4 | "defaultMessage": "!!!Settings", | 4 | "defaultMessage": "!!!Settings", |
5 | "file": "src/components/layout/Sidebar.js", | 5 | "file": "src/components/layout/Sidebar.js", |
6 | "start": { | 6 | "start": { |
7 | "line": 11, | 7 | "line": 12, |
8 | "column": 12 | 8 | "column": 12 |
9 | }, | 9 | }, |
10 | "end": { | 10 | "end": { |
11 | "line": 14, | 11 | "line": 15, |
12 | "column": 3 | 12 | "column": 3 |
13 | } | 13 | } |
14 | }, | 14 | }, |
@@ -17,11 +17,11 @@ | |||
17 | "defaultMessage": "!!!Add new service", | 17 | "defaultMessage": "!!!Add new service", |
18 | "file": "src/components/layout/Sidebar.js", | 18 | "file": "src/components/layout/Sidebar.js", |
19 | "start": { | 19 | "start": { |
20 | "line": 15, | 20 | "line": 16, |
21 | "column": 17 | 21 | "column": 17 |
22 | }, | 22 | }, |
23 | "end": { | 23 | "end": { |
24 | "line": 18, | 24 | "line": 19, |
25 | "column": 3 | 25 | "column": 3 |
26 | } | 26 | } |
27 | }, | 27 | }, |
@@ -30,11 +30,11 @@ | |||
30 | "defaultMessage": "!!!Disable notifications & audio", | 30 | "defaultMessage": "!!!Disable notifications & audio", |
31 | "file": "src/components/layout/Sidebar.js", | 31 | "file": "src/components/layout/Sidebar.js", |
32 | "start": { | 32 | "start": { |
33 | "line": 19, | 33 | "line": 20, |
34 | "column": 8 | 34 | "column": 8 |
35 | }, | 35 | }, |
36 | "end": { | 36 | "end": { |
37 | "line": 22, | 37 | "line": 23, |
38 | "column": 3 | 38 | "column": 3 |
39 | } | 39 | } |
40 | }, | 40 | }, |
@@ -43,11 +43,11 @@ | |||
43 | "defaultMessage": "!!!Enable notifications & audio", | 43 | "defaultMessage": "!!!Enable notifications & audio", |
44 | "file": "src/components/layout/Sidebar.js", | 44 | "file": "src/components/layout/Sidebar.js", |
45 | "start": { | 45 | "start": { |
46 | "line": 23, | 46 | "line": 24, |
47 | "column": 10 | 47 | "column": 10 |
48 | }, | 48 | }, |
49 | "end": { | 49 | "end": { |
50 | "line": 26, | 50 | "line": 27, |
51 | "column": 3 | 51 | "column": 3 |
52 | } | 52 | } |
53 | }, | 53 | }, |
@@ -56,11 +56,11 @@ | |||
56 | "defaultMessage": "!!!Open workspace drawer", | 56 | "defaultMessage": "!!!Open workspace drawer", |
57 | "file": "src/components/layout/Sidebar.js", | 57 | "file": "src/components/layout/Sidebar.js", |
58 | "start": { | 58 | "start": { |
59 | "line": 27, | 59 | "line": 28, |
60 | "column": 23 | 60 | "column": 23 |
61 | }, | 61 | }, |
62 | "end": { | 62 | "end": { |
63 | "line": 30, | 63 | "line": 31, |
64 | "column": 3 | 64 | "column": 3 |
65 | } | 65 | } |
66 | }, | 66 | }, |
@@ -69,11 +69,11 @@ | |||
69 | "defaultMessage": "!!!Close workspace drawer", | 69 | "defaultMessage": "!!!Close workspace drawer", |
70 | "file": "src/components/layout/Sidebar.js", | 70 | "file": "src/components/layout/Sidebar.js", |
71 | "start": { | 71 | "start": { |
72 | "line": 31, | 72 | "line": 32, |
73 | "column": 24 | 73 | "column": 24 |
74 | }, | 74 | }, |
75 | "end": { | 75 | "end": { |
76 | "line": 34, | 76 | "line": 35, |
77 | "column": 3 | 77 | "column": 3 |
78 | } | 78 | } |
79 | } | 79 | } |
diff --git a/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json b/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json index 4d8443b02..96a42aa80 100644 --- a/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json +++ b/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json | |||
@@ -4,11 +4,11 @@ | |||
4 | "defaultMessage": "!!!Available services", | 4 | "defaultMessage": "!!!Available services", |
5 | "file": "src/components/settings/navigation/SettingsNavigation.js", | 5 | "file": "src/components/settings/navigation/SettingsNavigation.js", |
6 | "start": { | 6 | "start": { |
7 | "line": 9, | 7 | "line": 10, |
8 | "column": 21 | 8 | "column": 21 |
9 | }, | 9 | }, |
10 | "end": { | 10 | "end": { |
11 | "line": 12, | 11 | "line": 13, |
12 | "column": 3 | 12 | "column": 3 |
13 | } | 13 | } |
14 | }, | 14 | }, |
@@ -17,11 +17,11 @@ | |||
17 | "defaultMessage": "!!!Your services", | 17 | "defaultMessage": "!!!Your services", |
18 | "file": "src/components/settings/navigation/SettingsNavigation.js", | 18 | "file": "src/components/settings/navigation/SettingsNavigation.js", |
19 | "start": { | 19 | "start": { |
20 | "line": 13, | 20 | "line": 14, |
21 | "column": 16 | 21 | "column": 16 |
22 | }, | 22 | }, |
23 | "end": { | 23 | "end": { |
24 | "line": 16, | 24 | "line": 17, |
25 | "column": 3 | 25 | "column": 3 |
26 | } | 26 | } |
27 | }, | 27 | }, |
@@ -30,11 +30,11 @@ | |||
30 | "defaultMessage": "!!!Your workspaces", | 30 | "defaultMessage": "!!!Your workspaces", |
31 | "file": "src/components/settings/navigation/SettingsNavigation.js", | 31 | "file": "src/components/settings/navigation/SettingsNavigation.js", |
32 | "start": { | 32 | "start": { |
33 | "line": 17, | 33 | "line": 18, |
34 | "column": 18 | 34 | "column": 18 |
35 | }, | 35 | }, |
36 | "end": { | 36 | "end": { |
37 | "line": 20, | 37 | "line": 21, |
38 | "column": 3 | 38 | "column": 3 |
39 | } | 39 | } |
40 | }, | 40 | }, |
@@ -43,11 +43,11 @@ | |||
43 | "defaultMessage": "!!!Account", | 43 | "defaultMessage": "!!!Account", |
44 | "file": "src/components/settings/navigation/SettingsNavigation.js", | 44 | "file": "src/components/settings/navigation/SettingsNavigation.js", |
45 | "start": { | 45 | "start": { |
46 | "line": 21, | 46 | "line": 22, |
47 | "column": 11 | 47 | "column": 11 |
48 | }, | 48 | }, |
49 | "end": { | 49 | "end": { |
50 | "line": 24, | 50 | "line": 25, |
51 | "column": 3 | 51 | "column": 3 |
52 | } | 52 | } |
53 | }, | 53 | }, |
@@ -56,11 +56,11 @@ | |||
56 | "defaultMessage": "!!!Settings", | 56 | "defaultMessage": "!!!Settings", |
57 | "file": "src/components/settings/navigation/SettingsNavigation.js", | 57 | "file": "src/components/settings/navigation/SettingsNavigation.js", |
58 | "start": { | 58 | "start": { |
59 | "line": 25, | 59 | "line": 26, |
60 | "column": 12 | 60 | "column": 12 |
61 | }, | 61 | }, |
62 | "end": { | 62 | "end": { |
63 | "line": 28, | 63 | "line": 29, |
64 | "column": 3 | 64 | "column": 3 |
65 | } | 65 | } |
66 | }, | 66 | }, |
@@ -69,11 +69,11 @@ | |||
69 | "defaultMessage": "!!!Invite Friends", | 69 | "defaultMessage": "!!!Invite Friends", |
70 | "file": "src/components/settings/navigation/SettingsNavigation.js", | 70 | "file": "src/components/settings/navigation/SettingsNavigation.js", |
71 | "start": { | 71 | "start": { |
72 | "line": 29, | 72 | "line": 30, |
73 | "column": 17 | 73 | "column": 17 |
74 | }, | 74 | }, |
75 | "end": { | 75 | "end": { |
76 | "line": 32, | 76 | "line": 33, |
77 | "column": 3 | 77 | "column": 3 |
78 | } | 78 | } |
79 | }, | 79 | }, |
@@ -82,11 +82,11 @@ | |||
82 | "defaultMessage": "!!!Logout", | 82 | "defaultMessage": "!!!Logout", |
83 | "file": "src/components/settings/navigation/SettingsNavigation.js", | 83 | "file": "src/components/settings/navigation/SettingsNavigation.js", |
84 | "start": { | 84 | "start": { |
85 | "line": 33, | 85 | "line": 34, |
86 | "column": 10 | 86 | "column": 10 |
87 | }, | 87 | }, |
88 | "end": { | 88 | "end": { |
89 | "line": 36, | 89 | "line": 37, |
90 | "column": 3 | 90 | "column": 3 |
91 | } | 91 | } |
92 | } | 92 | } |
diff --git a/src/lib/Menu.js b/src/lib/Menu.js index 3435e04f7..3d6b6c824 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js | |||
@@ -322,6 +322,7 @@ const _templateFactory = intl => [ | |||
322 | { | 322 | { |
323 | label: intl.formatMessage(menuItems.workspaces), | 323 | label: intl.formatMessage(menuItems.workspaces), |
324 | submenu: [], | 324 | submenu: [], |
325 | visible: workspaceStore.isFeatureActive, | ||
325 | }, | 326 | }, |
326 | { | 327 | { |
327 | label: intl.formatMessage(menuItems.window), | 328 | label: intl.formatMessage(menuItems.window), |
@@ -563,7 +564,6 @@ export default class FranzMenu { | |||
563 | _build() { | 564 | _build() { |
564 | // need to clone object so we don't modify computed (cached) object | 565 | // need to clone object so we don't modify computed (cached) object |
565 | const serviceTpl = Object.assign([], this.serviceTpl()); | 566 | const serviceTpl = Object.assign([], this.serviceTpl()); |
566 | const workspacesMenu = Object.assign([], this.workspacesMenu()); | ||
567 | 567 | ||
568 | if (window.franz === undefined) { | 568 | if (window.franz === undefined) { |
569 | return; | 569 | return; |
@@ -731,7 +731,9 @@ export default class FranzMenu { | |||
731 | tpl[3].submenu = serviceTpl; | 731 | tpl[3].submenu = serviceTpl; |
732 | } | 732 | } |
733 | 733 | ||
734 | tpl[4].submenu = workspacesMenu; | 734 | if (workspaceStore.isFeatureActive) { |
735 | tpl[4].submenu = this.workspacesMenu(); | ||
736 | } | ||
735 | 737 | ||
736 | this.currentTemplate = tpl; | 738 | this.currentTemplate = tpl; |
737 | const menu = Menu.buildFromTemplate(tpl); | 739 | const menu = Menu.buildFromTemplate(tpl); |
diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js index b7130904b..2bda82e17 100644 --- a/src/stores/FeaturesStore.js +++ b/src/stores/FeaturesStore.js | |||
@@ -23,7 +23,7 @@ export default class FeaturesStore extends Store { | |||
23 | ]); | 23 | ]); |
24 | 24 | ||
25 | await this.featuresRequest._promise; | 25 | await this.featuresRequest._promise; |
26 | setTimeout(this._enableFeatures.bind(this), 1); | 26 | setTimeout(this._setupFeatures.bind(this), 1); |
27 | 27 | ||
28 | // single key reaction | 28 | // single key reaction |
29 | reaction(() => this.stores.user.data.isPremium, () => { | 29 | reaction(() => this.stores.user.data.isPremium, () => { |
@@ -53,7 +53,7 @@ export default class FeaturesStore extends Store { | |||
53 | } | 53 | } |
54 | } | 54 | } |
55 | 55 | ||
56 | _enableFeatures() { | 56 | _setupFeatures() { |
57 | delayApp(this.stores, this.actions); | 57 | delayApp(this.stores, this.actions); |
58 | spellchecker(this.stores, this.actions); | 58 | spellchecker(this.stores, this.actions); |
59 | serviceProxy(this.stores, this.actions); | 59 | serviceProxy(this.stores, this.actions); |