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

package/lib/index.js

@@ -7,7 +7,7 @@ import { INotebookTracker } from '@jupyterlab/notebook';
 import { ITranslator } from '@jupyterlab/translation';
 import { Menu, MenuBar } from '@lumino/widgets';
 import { INotebookShell } from '@jupyter-notebook/application';
-import { caretDownIcon } from '@jupyterlab/ui-components';
+import { caretDownIcon, CommandToolbarButton, launchIcon, } from '@jupyterlab/ui-components';
 /**
  * The command IDs used by the application plugin.
  */
@@ -25,6 +25,10 @@ var CommandIDs;
      * Open in JupyterLab
      */
     CommandIDs.openLab = 'jupyter-notebook:open-lab';
+    /**
+     * Open in NbClassic
+     */
+    CommandIDs.openNbClassic = 'jupyter-notebook:open-nbclassic';
 })(CommandIDs || (CommandIDs = {}));
 /**
  * A plugin to add custom toolbar items to the notebook page
@@ -43,19 +47,41 @@ const interfaceSwitcher = {
         const { commands, shell } = app;
         const baseUrl = PageConfig.getBaseUrl();
         const trans = translator.load('notebook');
-        const overflowOptions = {
-            overflowMenuOptions: { isVisible: false },
-        };
-        const menubar = new MenuBar(overflowOptions);
+        const nbClassicEnabled = PageConfig.getOption('nbclassic_enabled') === 'true';
         const switcher = new Menu({ commands });
-        switcher.title.label = trans.__('Open in...');
-        switcher.title.icon = caretDownIcon;
-        menubar.addMenu(switcher);
+        const switcherOptions = [];
+        if (!notebookShell) {
+            switcherOptions.push({
+                command: CommandIDs.openNotebook,
+                commandLabel: trans.__('Notebook'),
+                commandDescription: trans.__('Open in %1', 'Jupyter Notebook'),
+                buttonLabel: 'openNotebook',
+                urlPrefix: `${baseUrl}tree/`,
+            });
+        }
+        if (!labShell) {
+            switcherOptions.push({
+                command: CommandIDs.openLab,
+                commandLabel: trans.__('JupyterLab'),
+                commandDescription: trans.__('Open in %1', 'JupyterLab'),
+                buttonLabel: 'openLab',
+                urlPrefix: `${baseUrl}doc/tree/`,
+            });
+        }
+        if (nbClassicEnabled) {
+            switcherOptions.push({
+                command: CommandIDs.openNbClassic,
+                commandLabel: trans.__('NbClassic'),
+                commandDescription: trans.__('Open in %1', 'NbClassic'),
+                buttonLabel: 'openNbClassic',
+                urlPrefix: `${baseUrl}nbclassic/notebooks/`,
+            });
+        }
         const isEnabled = () => {
             return (notebookTracker.currentWidget !== null &&
                 notebookTracker.currentWidget === shell.currentWidget);
         };
-        const addInterface = (option) => {
+        const addSwitcherCommand = (option) => {
             const { command, commandLabel, commandDescription, urlPrefix } = option;
             const execute = () => {
                 const current = notebookTracker.currentWidget;
@@ -83,33 +109,42 @@ const interfaceSwitcher = {
                     args: { isPalette: true },
                 });
             }
-            switcher.addItem({ command });
         };
-        if (!notebookShell) {
-            addInterface({
-                command: CommandIDs.openNotebook,
-                commandLabel: trans.__('Notebook'),
-                commandDescription: trans.__('Open in %1', 'Jupyter Notebook'),
-                buttonLabel: 'openNotebook',
-                urlPrefix: `${baseUrl}tree/`,
-            });
-        }
-        if (!labShell) {
-            addInterface({
-                command: CommandIDs.openLab,
-                commandLabel: trans.__('JupyterLab'),
-                commandDescription: trans.__('Open in %1', 'JupyterLab'),
-                buttonLabel: 'openLab',
-                urlPrefix: `${baseUrl}doc/tree/`,
-            });
+        switcherOptions.forEach((option) => {
+            const { command } = option;
+            addSwitcherCommand(option);
+            switcher.addItem({ command });
+        });
+        let toolbarFactory;
+        if (switcherOptions.length === 1) {
+            toolbarFactory = (panel) => {
+                const toolbarButton = new CommandToolbarButton({
+                    commands,
+                    id: switcherOptions[0].command,
+                    label: switcherOptions[0].commandLabel,
+                    icon: launchIcon,
+                });
+                toolbarButton.addClass('jp-nb-interface-switcher-button');
+                return toolbarButton;
+            };
         }
-        if (toolbarRegistry) {
-            toolbarRegistry.addFactory('Notebook', 'interfaceSwitcher', (panel) => {
+        else {
+            const overflowOptions = {
+                overflowMenuOptions: { isVisible: false },
+            };
+            const menubar = new MenuBar(overflowOptions);
+            switcher.title.label = trans.__('Open in...');
+            switcher.title.icon = caretDownIcon;
+            menubar.addMenu(switcher);
+            toolbarFactory = (panel) => {
                 const menubar = new MenuBar(overflowOptions);
                 menubar.addMenu(switcher);
                 menubar.addClass('jp-InterfaceSwitcher');
                 return menubar;
-            });
+            };
+        }
+        if (toolbarRegistry) {
+            toolbarRegistry.addFactory('Notebook', 'interfaceSwitcher', toolbarFactory);
         }
     },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyter-notebook/lab-extension",
-  "version": "7.0.0-beta.3",
+  "version": "7.0.0-rc.0",
   "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.3",
-    "@jupyterlab/application": "^4.0.0",
-    "@jupyterlab/apputils": "^4.0.0",
-    "@jupyterlab/coreutils": "^6.0.0",
-    "@jupyterlab/docregistry": "^4.0.0",
-    "@jupyterlab/notebook": "^4.0.0",
-    "@jupyterlab/translation": "^4.0.0",
-    "@jupyterlab/ui-components": "^4.0.0",
+    "@jupyter-notebook/application": "^7.0.0-rc.0",
+    "@jupyterlab/application": "^4.0.2",
+    "@jupyterlab/apputils": "^4.1.2",
+    "@jupyterlab/coreutils": "^6.0.2",
+    "@jupyterlab/docregistry": "^4.0.2",
+    "@jupyterlab/notebook": "^4.0.2",
+    "@jupyterlab/translation": "^4.0.2",
+    "@jupyterlab/ui-components": "^4.0.2",
     "@lumino/commands": "^2.1.1",
     "@lumino/disposable": "^2.1.1"
   },
   "devDependencies": {
-    "@jupyterlab/builder": "^4.0.0",
+    "@jupyterlab/builder": "^4.0.2",
     "rimraf": "^3.0.2",
     "typescript": "~5.0.2"
   },

package/schema/interface-switcher.json

@@ -22,6 +22,13 @@
             "args": {
               "isMenu": true
             }
+          },
+          {
+            "command": "jupyter-notebook:open-nbclassic",
+            "rank": 10,
+            "args": {
+              "isMenu": true
+            }
           }
         ]
       }