add workspace drawer toggle menu item and shortcut

5 files changed, 116 insertions, 37 deletions

diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 4bf9a8c0a..1c6c6c969 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -625,78 +625,78 @@
         "defaultMessage": "!!!Your services have been updated.",
         "end": {
           "column": 3,
-          "line": 25
+          "line": 27
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.servicesUpdated",
         "start": {
           "column": 19,
-          "line": 22
+          "line": 24
         }
       },
       {
         "defaultMessage": "!!!A new update for Franz is available.",
         "end": {
           "column": 3,
-          "line": 29
+          "line": 31
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.updateAvailable",
         "start": {
           "column": 19,
-          "line": 26
+          "line": 28
         }
       },
       {
         "defaultMessage": "!!!Reload services",
         "end": {
           "column": 3,
-          "line": 33
+          "line": 35
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.buttonReloadServices",
         "start": {
           "column": 24,
-          "line": 30
+          "line": 32
         }
       },
       {
         "defaultMessage": "!!!Changelog",
         "end": {
           "column": 3,
-          "line": 37
+          "line": 39
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.buttonChangelog",
         "start": {
           "column": 13,
-          "line": 34
+          "line": 36
         }
       },
       {
         "defaultMessage": "!!!Restart & install update",
         "end": {
           "column": 3,
-          "line": 41
+          "line": 43
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.buttonInstallUpdate",
         "start": {
           "column": 23,
-          "line": 38
+          "line": 40
         }
       },
       {
         "defaultMessage": "!!!Could not load services and user information",
         "end": {
           "column": 3,
-          "line": 45
+          "line": 47
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.requiredRequestsFailed",
         "start": {
           "column": 26,
-          "line": 42
+          "line": 44
         }
       }
     ],
@@ -4092,81 +4092,107 @@
         }
       },
       {
-        "defaultMessage": "!!!Activate next service...",
+        "defaultMessage": "!!!Open workspace drawer",
         "end": {
           "column": 3,
           "line": 191
         },
         "file": "src/lib/Menu.js",
-        "id": "menu.services.setNextServiceActive",
+        "id": "menu.workspaces.openWorkspaceDrawer",
         "start": {
           "column": 23,
           "line": 188
         }
       },
       {
-        "defaultMessage": "!!!Activate previous service...",
+        "defaultMessage": "!!!Close workspace drawer",
         "end": {
           "column": 3,
           "line": 195
         },
         "file": "src/lib/Menu.js",
+        "id": "menu.workspaces.closeWorkspaceDrawer",
+        "start": {
+          "column": 24,
+          "line": 192
+        }
+      },
+      {
+        "defaultMessage": "!!!Activate next service...",
+        "end": {
+          "column": 3,
+          "line": 199
+        },
+        "file": "src/lib/Menu.js",
+        "id": "menu.services.setNextServiceActive",
+        "start": {
+          "column": 23,
+          "line": 196
+        }
+      },
+      {
+        "defaultMessage": "!!!Activate previous service...",
+        "end": {
+          "column": 3,
+          "line": 203
+        },
+        "file": "src/lib/Menu.js",
         "id": "menu.services.activatePreviousService",
         "start": {
           "column": 27,
-          "line": 192
+          "line": 200
         }
       },
       {
         "defaultMessage": "!!!Disable notifications & audio",
         "end": {
           "column": 3,
-          "line": 199
+          "line": 207
         },
         "file": "src/lib/Menu.js",
         "id": "sidebar.muteApp",
         "start": {
           "column": 11,
-          "line": 196
+          "line": 204
         }
       },
       {
         "defaultMessage": "!!!Enable notifications & audio",
         "end": {
           "column": 3,
-          "line": 203
+          "line": 211
         },
         "file": "src/lib/Menu.js",
         "id": "sidebar.unmuteApp",
         "start": {
           "column": 13,
-          "line": 200
+          "line": 208
         }
       },
       {
         "defaultMessage": "!!!Workspaces",
         "end": {
           "column": 3,
-          "line": 207
+          "line": 215
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces",
         "start": {
           "column": 14,
-          "line": 204
+          "line": 212
         }
       },
       {
         "defaultMessage": "!!!Default",
         "end": {
           "column": 3,
-          "line": 211
+          "line": 219
         },
         "file": "src/lib/Menu.js",
         "id": "menu.workspaces.defaultWorkspace",
         "start": {
           "column": 20,
-          "line": 208
+          "line": 216
         }
       }
     ],
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 94c6fcf32..9716c3717 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -89,7 +89,9 @@
   "menu.window.minimize": "Minimize",
   "menu.workspaces": "Workspaces",
   "menu.workspaces.addNewWorkspace": "Add New Workspace...",
+  "menu.workspaces.closeWorkspaceDrawer": "Close workspace drawer",
   "menu.workspaces.defaultWorkspace": "All services",
+  "menu.workspaces.openWorkspaceDrawer": "Open workspace drawer",
   "password.email.label": "Email address",
   "password.headline": "Reset password",
   "password.link.login": "Sign in to your account",
diff --git a/src/i18n/messages/src/lib/Menu.json b/src/i18n/messages/src/lib/Menu.json
index 53fa038c6..adbbd2638 100644
--- a/src/i18n/messages/src/lib/Menu.json
+++ b/src/i18n/messages/src/lib/Menu.json
@@ -572,8 +572,8 @@
     }
   },
   {
-    "id": "menu.services.setNextServiceActive",
-    "defaultMessage": "!!!Activate next service...",
+    "id": "menu.workspaces.openWorkspaceDrawer",
+    "defaultMessage": "!!!Open workspace drawer",
     "file": "src/lib/Menu.js",
     "start": {
       "line": 188,
@@ -585,15 +585,41 @@
     }
   },
   {
+    "id": "menu.workspaces.closeWorkspaceDrawer",
+    "defaultMessage": "!!!Close workspace drawer",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 192,
+      "column": 24
+    },
+    "end": {
+      "line": 195,
+      "column": 3
+    }
+  },
+  {
+    "id": "menu.services.setNextServiceActive",
+    "defaultMessage": "!!!Activate next service...",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 196,
+      "column": 23
+    },
+    "end": {
+      "line": 199,
+      "column": 3
+    }
+  },
+  {
     "id": "menu.services.activatePreviousService",
     "defaultMessage": "!!!Activate previous service...",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 192,
+      "line": 200,
       "column": 27
     },
     "end": {
-      "line": 195,
+      "line": 203,
       "column": 3
     }
   },
@@ -602,11 +628,11 @@
     "defaultMessage": "!!!Disable notifications & audio",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 196,
+      "line": 204,
       "column": 11
     },
     "end": {
-      "line": 199,
+      "line": 207,
       "column": 3
     }
   },
@@ -615,11 +641,11 @@
     "defaultMessage": "!!!Enable notifications & audio",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 200,
+      "line": 208,
       "column": 13
     },
     "end": {
-      "line": 203,
+      "line": 211,
       "column": 3
     }
   },
@@ -628,11 +654,11 @@
     "defaultMessage": "!!!Workspaces",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 204,
+      "line": 212,
       "column": 14
     },
     "end": {
-      "line": 207,
+      "line": 215,
       "column": 3
     }
   },
@@ -641,11 +667,11 @@
     "defaultMessage": "!!!Default",
     "file": "src/lib/Menu.js",
     "start": {
-      "line": 208,
+      "line": 216,
       "column": 20
     },
     "end": {
-      "line": 211,
+      "line": 219,
       "column": 3
     }
   }
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 1d4f0e001..2a88515f4 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -185,6 +185,14 @@ const menuItems = defineMessages({
     id: 'menu.workspaces.addNewWorkspace',
     defaultMessage: '!!!Add New Workspace...',
   },
+  openWorkspaceDrawer: {
+    id: 'menu.workspaces.openWorkspaceDrawer',
+    defaultMessage: '!!!Open workspace drawer',
+  },
+  closeWorkspaceDrawer: {
+    id: 'menu.workspaces.closeWorkspaceDrawer',
+    defaultMessage: '!!!Close workspace drawer',
+  },
   activateNextService: {
     id: 'menu.services.setNextServiceActive',
     defaultMessage: '!!!Activate next service...',
@@ -788,6 +796,19 @@ export default class FranzMenu {
         workspaceActions.openWorkspaceSettings();
       },
       enabled: this.stores.user.isLoggedIn,
+    });
+
+    // Open workspace drawer:
+    const drawerLabel = (
+      workspacesState.isWorkspaceDrawerOpen ? menuItems.closeWorkspaceDrawer : menuItems.openWorkspaceDrawer
+    );
+    menu.push({
+      label: intl.formatMessage(drawerLabel),
+      accelerator: `${cmdKey}+D`,
+      click: () => {
+        workspaceActions.toggleWorkspaceDrawer();
+      },
+      enabled: this.stores.user.isLoggedIn,
     }, {
       type: 'separator',
     });
@@ -804,7 +825,7 @@ export default class FranzMenu {
     });
 
     // Workspace items
-    if (this.stores.user.isLoggedIn) {
+    if (this.stores.user.isPremium) {
       workspaces.forEach((workspace, i) => menu.push({
         label: workspace.name,
         accelerator: i < 9 ? `${cmdKey}+Alt+${i + 1}` : null,
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 77d84afe1..534690fbb 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -142,6 +142,10 @@ export default class UserStore extends Store {
     return this.getUserInfoRequest.execute().result || {};
   }
 
+  @computed get isPremium() {
+    return !!this.data.isPremium;
+  }
+
   @computed get legacyServices() {
     return this.getLegacyServicesRequest.execute() || {};
   }