@jupyter-notebook/notebook-extension 7.7.0-alpha.0 → 7.7.0-alpha.2

package/lib/index.js

@@ -1,14 +1,16 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 import { Dialog, DOMUtils, IToolbarWidgetRegistry, ICommandPalette, showDialog, } from '@jupyterlab/apputils';
-import { PageConfig, Text, Time, URLExt } from '@jupyterlab/coreutils';
+import { Time, URLExt } from '@jupyterlab/coreutils';
 import { IDebuggerSidebar } from '@jupyterlab/debugger';
 import { IDocumentManager } from '@jupyterlab/docmanager';
 import { IMainMenu } from '@jupyterlab/mainmenu';
+import { IMetadataFormProvider } from '@jupyterlab/metadataform';
 import { NotebookPanel, INotebookTracker, INotebookTools, } from '@jupyterlab/notebook';
 import { ISettingRegistry } from '@jupyterlab/settingregistry';
 import { ITableOfContentsTracker } from '@jupyterlab/toc';
 import { ITranslator, nullTranslator } from '@jupyterlab/translation';
+import { Collapser } from '@jupyterlab/ui-components';
 import { INotebookShell } from '@jupyter-notebook/application';
 import { find } from '@lumino/algorithm';
 import { Poll } from '@lumino/polling';
@@ -245,7 +247,7 @@ const openTreeTab = {
         commands.addCommand(id, {
             label: trans.__('Open…'),
             execute: async () => {
-                const url = URLExt.join(PageConfig.getBaseUrl(), 'tree');
+                const url = URLExt.join(app.serviceManager.serverSettings.baseUrl, 'tree');
                 window.open(url);
             },
             describedBy: {
@@ -395,9 +397,26 @@ const kernelStatus = {
             widget.removeClass(KERNEL_STATUS_INFO_CLASS);
             widget.removeClass(KERNEL_STATUS_FADE_OUT_CLASS);
         };
+        // The labels are enumerated explicitly so the translation extractor picks
+        // them up, since msgids must be literal strings.
+        const statusLabels = {
+            unknown: trans.__('Kernel Unknown'),
+            starting: trans.__('Kernel Starting'),
+            idle: trans.__('Kernel Idle'),
+            busy: trans.__('Kernel Busy'),
+            terminating: trans.__('Kernel Terminating'),
+            restarting: trans.__('Kernel Restarting'),
+            autorestarting: trans.__('Kernel Autorestarting'),
+            dead: trans.__('Kernel Dead'),
+            connected: trans.__('Kernel Connected'),
+            connecting: trans.__('Kernel Connecting'),
+            disconnected: trans.__('Kernel Disconnected'),
+            initializing: trans.__('Kernel Initializing'),
+            '': '',
+        };
         const onStatusChanged = (sessionContext) => {
             const status = sessionContext.kernelDisplayStatus;
-            let text = `Kernel ${Text.titleCase(status)}`;
+            let text = statusLabels[status];
             removeClasses();
             switch (status) {
                 case 'busy':
@@ -417,7 +436,7 @@ const kernelStatus = {
                     widget.addClass(KERNEL_STATUS_FADE_OUT_CLASS);
                     break;
             }
-            widget.node.textContent = trans.__(text);
+            widget.node.textContent = text;
         };
         const onChange = async () => {
             const current = shell.currentWidget;
@@ -467,6 +486,17 @@ const scrollOutput = {
             cell.toggleClass(SCROLLED_OUTPUTS_CLASS, scroll);
         };
         const handlers = {};
+        // outputs render asynchronously, so the height measured on a model
+        // change can be stale: check again whenever the output area is resized
+        const observedCells = new WeakMap();
+        const resizeObserver = new ResizeObserver((entries) => {
+            entries.forEach((entry) => {
+                const cell = observedCells.get(entry.target);
+                if (cell && !cell.isDisposed) {
+                    autoScroll(cell);
+                }
+            });
+        });
         const setAutoScroll = (cell) => {
             if (cell.model.type === 'code') {
                 const codeCell = cell;
@@ -477,6 +507,12 @@ const scrollOutput = {
                 }
                 handlers[id] = () => autoScroll(codeCell);
                 codeCell.outputArea.model.changed.connect(handlers[id]);
+                const { node } = codeCell.outputArea;
+                if (!observedCells.has(node)) {
+                    observedCells.set(node, codeCell);
+                    resizeObserver.observe(node);
+                    codeCell.disposed.connect(() => resizeObserver.unobserve(node));
+                }
             }
         };
         tracker.widgetAdded.connect((sender, notebook) => {
@@ -541,7 +577,7 @@ const tabIcon = {
     requires: [INotebookTracker],
     activate: (app, tracker) => {
         // the favicons are provided by Jupyter Server
-        const baseURL = PageConfig.getBaseUrl();
+        const baseURL = app.serviceManager.serverSettings.baseUrl;
         const notebookIcon = URLExt.join(baseURL, 'static/favicons/favicon-notebook.ico');
         const busyIcon = URLExt.join(baseURL, 'static/favicons/favicon-busy-1.ico');
         const updateBrowserFavicon = (status) => {
@@ -600,8 +636,13 @@ const editNotebookMetadata = {
     id: '@jupyter-notebook/notebook-extension:edit-notebook-metadata',
     description: 'Add a command to open right sidebar for Editing Notebook Metadata when clicking on "Edit Notebook Metadata" under Edit menu',
     autoStart: true,
-    optional: [ICommandPalette, ITranslator, INotebookTools],
-    activate: (app, palette, translator, notebookTools) => {
+    optional: [
+        ICommandPalette,
+        ITranslator,
+        INotebookTools,
+        IMetadataFormProvider,
+    ],
+    activate: (app, palette, translator, notebookTools, metadataForms) => {
         const { commands, shell } = app;
         translator = translator !== null && translator !== void 0 ? translator : nullTranslator;
         const trans = translator.load('notebook');
@@ -611,23 +652,24 @@ const editNotebookMetadata = {
                 const command = 'application:toggle-panel';
                 const args = {
                     side: 'right',
-                    title: 'Show Notebook Tools',
+                    title: trans.__('Notebook Tools'),
                     id: 'notebook-tools',
                 };
                 // Check if Show Notebook Tools (Right Sidebar) is open (expanded)
                 if (!commands.isToggled(command, args)) {
-                    await commands.execute(command, args).then((_) => {
-                        // For expanding the 'Advanced Tools' section (default: collapsed)
-                        if (notebookTools) {
-                            const tools = (notebookTools === null || notebookTools === void 0 ? void 0 : notebookTools.layout).widgets;
-                            tools.forEach((tool) => {
-                                if (tool.widget.title.label === trans.__('Advanced Tools') &&
-                                    tool.collapsed) {
-                                    tool.toggle();
-                                }
-                            });
+                    await commands.execute(command, args);
+                    // For expanding the 'Advanced Tools' section (default: collapsed)
+                    const advancedToolsForm = metadataForms === null || metadataForms === void 0 ? void 0 : metadataForms.get('advancedToolsSection');
+                    if (notebookTools && advancedToolsForm) {
+                        const layout = notebookTools.layout;
+                        for (const section of layout.widgets) {
+                            if (section instanceof Collapser &&
+                                section.widget === advancedToolsForm.parent &&
+                                section.collapsed) {
+                                section.toggle();
+                            }
                         }
-                    });
+                    }
                 }
             },
             isVisible: () => shell.currentWidget !== null &&

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyter-notebook/notebook-extension",
-  "version": "7.7.0-alpha.0",
+  "version": "7.7.0-alpha.2",
   "description": "Jupyter Notebook - Notebook Extension",
   "homepage": "https://github.com/jupyter/notebook",
   "bugs": {
@@ -38,16 +38,18 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@jupyter-notebook/application": "^7.7.0-alpha.0",
-    "@jupyterlab/application": "~4.7.0-alpha.0",
-    "@jupyterlab/apputils": "~4.8.0-alpha.0",
-    "@jupyterlab/cells": "~4.7.0-alpha.0",
-    "@jupyterlab/debugger": "~4.7.0-alpha.0",
-    "@jupyterlab/docmanager": "~4.7.0-alpha.0",
-    "@jupyterlab/notebook": "~4.7.0-alpha.0",
-    "@jupyterlab/settingregistry": "~4.7.0-alpha.0",
-    "@jupyterlab/toc": "~6.7.0-alpha.0",
-    "@jupyterlab/translation": "~4.7.0-alpha.0",
+    "@jupyter-notebook/application": "^7.7.0-alpha.2",
+    "@jupyterlab/application": "~4.7.0-alpha.2",
+    "@jupyterlab/apputils": "~4.8.0-alpha.2",
+    "@jupyterlab/cells": "~4.7.0-alpha.2",
+    "@jupyterlab/debugger": "~4.7.0-alpha.2",
+    "@jupyterlab/docmanager": "~4.7.0-alpha.2",
+    "@jupyterlab/metadataform": "~4.7.0-alpha.2",
+    "@jupyterlab/notebook": "~4.7.0-alpha.2",
+    "@jupyterlab/settingregistry": "~4.7.0-alpha.2",
+    "@jupyterlab/toc": "~6.7.0-alpha.2",
+    "@jupyterlab/translation": "~4.7.0-alpha.2",
+    "@jupyterlab/ui-components": "~4.7.0-alpha.2",
     "@lumino/algorithm": "2.0.4",
     "@lumino/polling": "^2.1.5",
     "@lumino/widgets": "^2.7.2",