Change "Interface" menu to "Open in...", shorten names of menu items …

…inside (#6847)

* rename commandLabel

* attemp to keep longer name in command palette

* Remove trying to keep longer name for command palette

* Attempt to register 2 commands to show the same command in the command palette

* fix passing paletteCommand to palette.addItem

* account for "args" being potentially passed to label

* change command palette wording to "Open in"

* capitalize "in" in "Open In..." btn title for consistency

* Make "in" not capitalized in "Open in..."

* use 'Open in %1' string formation form

* Update snapshots

* rename commandPaletteLabel into commandDescription

* use command with description as a label in view menu

* update snapshots manually

* update more snapshots manually

* Use isPalette and isMenu

* Lint

---------

Co-authored-by: Jeremy Tuloup <jeremy.tuloup@gmail.com>

packages/lab-extension/schema/interface-switcher.json

@@ -11,11 +11,17 @@
         "items": [
           {
             "command": "jupyter-notebook:open-notebook",
-            "rank": 10
+            "rank": 10,
+            "args": {
+              "isMenu": true
+            }
           },
           {
             "command": "jupyter-notebook:open-lab",
-            "rank": 10
+            "rank": 10,
+            "args": {
+              "isMenu": true
+            }
           }
         ]
       }

packages/lab-extension/src/index.ts

@@ -44,6 +44,7 @@ namespace CommandIDs {
 interface ISwitcherChoice {
   command: string;
   commandLabel: string;
+  commandDescription: string;
   buttonLabel: string;
   urlPrefix: string;
 }
@@ -78,7 +79,7 @@ const interfaceSwitcher: JupyterFrontEndPlugin<void> = {
     };
     const menubar = new MenuBar(overflowOptions);
     const switcher = new Menu({ commands });
-    switcher.title.label = trans.__('Interface');
+    switcher.title.label = trans.__('Open in...');
     switcher.title.icon = caretDownIcon;
     menubar.addMenu(switcher);
 
@@ -90,22 +91,35 @@ const interfaceSwitcher: JupyterFrontEndPlugin<void> = {
     };
 
     const addInterface = (option: ISwitcherChoice) => {
-      const { command, commandLabel, urlPrefix } = option;
+      const { command, commandLabel, commandDescription, urlPrefix } = option;
+
+      const execute = () => {
+        const current = notebookTracker.currentWidget;
+        if (!current) {
+          return;
+        }
+        window.open(`${urlPrefix}${current.context.path}`);
+      };
+
       commands.addCommand(command, {
-        label: (args) => (args.noLabel ? '' : commandLabel),
-        caption: commandLabel,
-        execute: () => {
-          const current = notebookTracker.currentWidget;
-          if (!current) {
-            return;
+        label: (args) => {
+          args.noLabel ? '' : commandLabel;
+          if (args.isMenu || args.isPalette) {
+            return commandDescription;
           }
-          window.open(`${urlPrefix}${current.context.path}`);
+          return commandLabel;
         },
+        caption: commandLabel,
+        execute,
         isEnabled,
       });
 
       if (palette) {
-        palette.addItem({ command, category: 'Other' });
+        palette.addItem({
+          command,
+          category: 'Other',
+          args: { isPalette: true },
+        });
       }
 
       switcher.addItem({ command });
@@ -114,7 +128,8 @@ const interfaceSwitcher: JupyterFrontEndPlugin<void> = {
     if (!notebookShell) {
       addInterface({
         command: CommandIDs.openNotebook,
-        commandLabel: trans.__('Open With %1', 'Jupyter Notebook'),
+        commandLabel: trans.__('Notebook'),
+        commandDescription: trans.__('Open in %1', 'Jupyter Notebook'),
         buttonLabel: 'openNotebook',
         urlPrefix: `${baseUrl}tree/`,
       });
@@ -123,7 +138,8 @@ const interfaceSwitcher: JupyterFrontEndPlugin<void> = {
     if (!labShell) {
       addInterface({
         command: CommandIDs.openLab,
-        commandLabel: trans.__('Open With %1', 'JupyterLab'),
+        commandLabel: trans.__('JupyterLab'),
+        commandDescription: trans.__('Open in %1', 'JupyterLab'),
         buttonLabel: 'openLab',
         urlPrefix: `${baseUrl}doc/tree/`,
       });