Add NotebookTools widget in right panel

Author: brichet

app/index.js

@@ -91,6 +91,7 @@ async function main() {
         '@jupyterlab/apputils-extension:toolbar-registry'
       ].includes(id)
     ),
+    require('@jupyterlab/celltags-extension'),
     require('@jupyterlab/codemirror-extension').default.filter(({ id }) =>
       [
         '@jupyterlab/codemirror-extension:services',
@@ -137,6 +138,7 @@ async function main() {
         '@jupyterlab/notebook-extension:export',
         '@jupyterlab/notebook-extension:factory',
         '@jupyterlab/notebook-extension:toc',
+        '@jupyterlab/notebook-extension:tools',
         '@jupyterlab/notebook-extension:tracker',
         '@jupyterlab/notebook-extension:widget-factory'
       ].includes(id)

app/package.json

@@ -28,6 +28,7 @@
     "@jupyterlab/cell-toolbar": "~4.0.0-alpha.10",
     "@jupyterlab/cell-toolbar-extension": "~4.0.0-alpha.10",
     "@jupyterlab/celltags": "~4.0.0-alpha.10",
+    "@jupyterlab/celltags-extension": "~4.0.0-alpha.10",
     "@jupyterlab/codeeditor": "~4.0.0-alpha.10",
     "@jupyterlab/codemirror-extension": "~4.0.0-alpha.10",
     "@jupyterlab/completer": "~4.0.0-alpha.10",
@@ -110,6 +111,7 @@
     "@jupyterlab/apputils-extension": "^4.0.0-alpha.10",
     "@jupyterlab/cell-toolbar-extension": "^4.0.0-alpha.10",
     "@jupyterlab/celltags": "^4.0.0-alpha.10",
+    "@jupyterlab/celltags-extension": "^4.0.0-alpha.10",
     "@jupyterlab/codemirror-extension": "^4.0.0-alpha.10",
     "@jupyterlab/completer-extension": "^4.0.0-alpha.10",
     "@jupyterlab/console-extension": "^4.0.0-alpha.10",

packages/application-extension/src/index.ts

@@ -28,6 +28,8 @@ import { DocumentWidget } from '@jupyterlab/docregistry';
 
 import { IMainMenu } from '@jupyterlab/mainmenu';
 
+import { INotebookTools } from '@jupyterlab/notebook';
+
 import { ISettingRegistry } from '@jupyterlab/settingregistry';
 
 import { ITranslator } from '@jupyterlab/translation';
@@ -594,13 +596,14 @@ const topVisibility: JupyterFrontEndPlugin<void> = {
 const sidebarVisibility: JupyterFrontEndPlugin<void> = {
   id: '@jupyter-notebook/application-extension:sidebar',
   requires: [INotebookShell, ITranslator],
-  optional: [IMainMenu, ISettingRegistry],
+  optional: [IMainMenu, ISettingRegistry, INotebookTools],
   activate: (
     app: JupyterFrontEnd<JupyterFrontEnd.IShell>,
     notebookShell: INotebookShell,
     translator: ITranslator,
     menu: IMainMenu | null,
-    settingRegistry: ISettingRegistry | null
+    settingRegistry: ISettingRegistry | null,
+    notebookTools: INotebookTools | null
   ) => {
     if (!sidePanelsEnabled()) {
       return;
@@ -687,6 +690,8 @@ const sidebarVisibility: JupyterFrontEndPlugin<void> = {
 
         notebookShell.leftHandler.updateMenu();
         notebookShell.rightHandler.updateMenu();
+
+        if (notebookTools) notebookShell.add(notebookTools, 'right');
       }
     });
   },

ui-tests/test/notebook.spec.ts

@@ -116,4 +116,22 @@ test.describe('Notebook', () => {
       )
     ).toHaveCount(3);
   });
+
+  test('Open notebook tools right panel', async ({ page, tmpPath }) => {
+    const notebook = 'simple.ipynb';
+    const menuPath = 'View>Show Right Sidebar>Table Of Contents';
+    await page.contents.uploadFile(
+      path.resolve(__dirname, `./notebooks/${notebook}`),
+      `${tmpPath}/${notebook}`
+    );
+    await page.goto(`notebooks/${tmpPath}/${notebook}`);
+
+    await waitForKernelReady(page);
+
+    await page.menu.open(menuPath);
+
+    await page.isVisible('#notebook-tools.jp-NotebookTools');
+
+    await page.isVisible('#notebook-tools.jp-NotebookTools > #add-tag.tag');
+  });
 });

yarn.lock

@@ -1654,7 +1654,17 @@
     "@lumino/widgets" "^1.32.0"
     react "^17.0.1"
 
-"@jupyterlab/celltags@^4.0.0-alpha.10":
+"@jupyterlab/celltags-extension@^4.0.0-alpha.10":
+  version "4.0.0-alpha.11"
+  resolved "https://registry.yarnpkg.com/@jupyterlab/celltags-extension/-/celltags-extension-4.0.0-alpha.11.tgz#1566e425673a224723870c13aa509d3698700627"
+  integrity sha512-uz4NUhD72SBQbhpbY2RBHUUU/+Q+9JR5XB2YptpO6M+NuDe6+1R2DYm1eupDQmOVLCO7JZd3c2D9LEEOYJlrMg==
+  dependencies:
+    "@jupyterlab/application" "^4.0.0-alpha.11"
+    "@jupyterlab/celltags" "^4.0.0-alpha.11"
+    "@jupyterlab/notebook" "^4.0.0-alpha.11"
+    "@jupyterlab/translation" "^4.0.0-alpha.11"
+
+"@jupyterlab/celltags@^4.0.0-alpha.10", "@jupyterlab/celltags@^4.0.0-alpha.11":
   version "4.0.0-alpha.11"
   resolved "https://registry.yarnpkg.com/@jupyterlab/celltags/-/celltags-4.0.0-alpha.11.tgz#a6da321605ffa2ac92db2ea81a85742cfb8bb925"
   integrity sha512-MB/qi/NzNUrfuoq8O5lfJe1r+mPvRSvlHZmtjQ+QeXhPFNeNSxMwOwwOmrVqIC72FpjlMYKEUvlVrrtEfIfUOA==