@jupyter-notebook/lab-extension 7.0.0-beta.0 → 7.0.0-beta.2

package/lib/index.js

@@ -48,7 +48,7 @@ const interfaceSwitcher = {
         };
         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);
         const isEnabled = () => {
@@ -56,28 +56,40 @@ const interfaceSwitcher = {
                 notebookTracker.currentWidget === shell.currentWidget);
         };
         const addInterface = (option) => {
-            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 });
         };
         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/`,
             });
@@ -85,7 +97,8 @@ const interfaceSwitcher = {
         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/`,
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyter-notebook/lab-extension",
-  "version": "7.0.0-beta.0",
+  "version": "7.0.0-beta.2",
   "description": "Jupyter Notebook - Lab Extension",
   "homepage": "https://github.com/jupyter/notebook",
   "bugs": {
@@ -43,19 +43,19 @@
     "watch:src": "tsc -w"
   },
   "dependencies": {
-    "@jupyter-notebook/application": "^7.0.0-beta.0",
-    "@jupyterlab/application": "^4.0.0-beta.0",
-    "@jupyterlab/apputils": "^4.0.0-beta.0",
-    "@jupyterlab/coreutils": "^6.0.0-beta.0",
-    "@jupyterlab/docregistry": "^4.0.0-beta.0",
-    "@jupyterlab/notebook": "^4.0.0-beta.0",
-    "@jupyterlab/translation": "^4.0.0-beta.0",
-    "@jupyterlab/ui-components": "^4.0.0-beta.0",
-    "@lumino/commands": "^2.0.1",
-    "@lumino/disposable": "^2.0.0"
+    "@jupyter-notebook/application": "^7.0.0-beta.2",
+    "@jupyterlab/application": "^4.0.0-rc.1",
+    "@jupyterlab/apputils": "^4.0.0-rc.1",
+    "@jupyterlab/coreutils": "^6.0.0-rc.1",
+    "@jupyterlab/docregistry": "^4.0.0-rc.1",
+    "@jupyterlab/notebook": "^4.0.0-rc.1",
+    "@jupyterlab/translation": "^4.0.0-rc.1",
+    "@jupyterlab/ui-components": "^4.0.0-rc.1",
+    "@lumino/commands": "^2.1.1",
+    "@lumino/disposable": "^2.1.1"
   },
   "devDependencies": {
-    "@jupyterlab/builder": "^4.0.0-beta.0",
+    "@jupyterlab/builder": "^4.0.0-rc.1",
     "rimraf": "^3.0.2",
     "typescript": "~5.0.2"
   },

package/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
+            }
           }
         ]
       }