@jupyter-notebook/application-extension 7.7.0-alpha.1 → 7.7.0-beta.0

package/lib/index.js

@@ -17,9 +17,9 @@ import { PromiseDelegate } from '@lumino/coreutils';
 import { DisposableDelegate, DisposableSet, } from '@lumino/disposable';
 import { Menu, Widget } from '@lumino/widgets';
 /**
- * A regular expression to match path to notebooks and documents
+ * A regular expression to match the notebook and editor routes
  */
-const TREE_PATTERN = new RegExp('/(notebooks|edit)/(.*)');
+const DOCUMENT_PATTERN = new RegExp('^/(notebooks|edit)/(.*)$');
 /**
  * A regular expression to suppress the file extension from display for .ipynb files.
  */
@@ -114,7 +114,7 @@ const logo = {
     description: 'The logo plugin.',
     autoStart: true,
     activate: (app) => {
-        const baseUrl = PageConfig.getBaseUrl();
+        const baseUrl = app.serviceManager.serverSettings.baseUrl;
         const node = document.createElement('a');
         node.href = `${baseUrl}tree`;
         node.target = '_blank';
@@ -149,7 +149,7 @@ const opener = {
             execute: (args) => {
                 var _a;
                 const parsed = args;
-                const matches = (_a = parsed.path.match(TREE_PATTERN)) !== null && _a !== void 0 ? _a : [];
+                const matches = (_a = parsed.path.match(DOCUMENT_PATTERN)) !== null && _a !== void 0 ? _a : [];
                 const [, , path] = matches;
                 if (!path) {
                     return;
@@ -178,9 +178,31 @@ const opener = {
                         });
                     }
                     const factory = (_a = urlParams.get('factory')) !== null && _a !== void 0 ? _a : defaultFactory;
-                    docManager.open(file, factory, undefined, {
+                    const kernelPreference = urlParams.get('kernel') === 'none'
+                        ? { shouldStart: false, shouldReuse: false }
+                        : undefined;
+                    const widget = docManager.openOrReveal(file, factory, undefined, {
                         ref: '_noref',
-                    });
+                    }, kernelPreference);
+                    if (kernelPreference && widget) {
+                        const { sessionContext } = widget.context;
+                        /**
+                         * `kernel=none` only describes how to open the notebook. Drop it
+                         * as soon as a kernel runs, so a reload reconnects to that session.
+                         */
+                        const clearNoKernelQuery = () => {
+                            var _a;
+                            if (!((_a = sessionContext.session) === null || _a === void 0 ? void 0 : _a.kernel)) {
+                                return;
+                            }
+                            const url = new URL(window.location.href);
+                            url.searchParams.delete('kernel');
+                            window.history.replaceState(window.history.state, '', url.toString());
+                            sessionContext.kernelChanged.disconnect(clearNoKernelQuery);
+                        };
+                        sessionContext.kernelChanged.connect(clearNoKernelQuery);
+                        clearNoKernelQuery();
+                    }
                 });
             },
             describedBy: {
@@ -200,7 +222,7 @@ const opener = {
                 },
             },
         });
-        router.register({ command, pattern: TREE_PATTERN });
+        router.register({ command, pattern: DOCUMENT_PATTERN });
     },
 };
 /**
@@ -257,7 +279,7 @@ const pages = {
     optional: [ICommandPalette],
     activate: (app, translator, palette) => {
         const trans = translator.load('notebook');
-        const baseUrl = PageConfig.getBaseUrl();
+        const baseUrl = app.serviceManager.serverSettings.baseUrl;
         app.commands.addCommand(CommandIDs.openLab, {
             label: trans.__('Open JupyterLab'),
             execute: () => {
@@ -289,8 +311,14 @@ const pages = {
             },
         });
         if (palette) {
-            palette.addItem({ command: CommandIDs.openLab, category: 'View' });
-            palette.addItem({ command: CommandIDs.openTree, category: 'View' });
+            palette.addItem({
+                command: CommandIDs.openLab,
+                category: trans.__('View'),
+            });
+            palette.addItem({
+                command: CommandIDs.openTree,
+                category: trans.__('View'),
+            });
         }
     },
 };
@@ -351,7 +379,7 @@ const rendermime = {
                     return docManager.services.contents
                         .get(path, { content: false })
                         .then((model) => {
-                        const baseUrl = PageConfig.getBaseUrl();
+                        const baseUrl = app.serviceManager.serverSettings.baseUrl;
                         opener.open({
                             prefix: URLExt.join(baseUrl, 'tree'),
                             path: model.path,
@@ -602,7 +630,7 @@ const title = {
                     if (!router) {
                         return;
                     }
-                    const matches = (_a = router.current.path.match(TREE_PATTERN)) !== null && _a !== void 0 ? _a : [];
+                    const matches = (_a = router.current.path.match(DOCUMENT_PATTERN)) !== null && _a !== void 0 ? _a : [];
                     const [, route, path] = matches;
                     if (!route || !path) {
                         return;
@@ -680,7 +708,10 @@ const topVisibility = {
             });
         }
         if (palette) {
-            palette.addItem({ command: CommandIDs.toggleTop, category: 'View' });
+            palette.addItem({
+                command: CommandIDs.toggleTop,
+                category: trans.__('View'),
+            });
         }
         const onChanged = () => {
             if (!adjustToScreen) {
@@ -715,7 +746,7 @@ const sidePanelVisibility = {
          * id, widget ID to activate in the side panel
          */
         app.commands.addCommand(CommandIDs.togglePanel, {
-            label: (args) => args['title'],
+            label: (args) => trans.__('Show %1', args['title']),
             caption: (args) => {
                 // We do not substitute the parameter into the string because the parameter is not
                 // localized (e.g., it is always 'left') even though the string is localized.
@@ -796,7 +827,7 @@ const sidePanelVisibility = {
                         },
                         title: {
                             type: 'string',
-                            description: 'The title shown for the side panel entry.',
+                            description: 'The title of the side panel widget.',
                         },
                         id: {
                             type: 'string',
@@ -816,38 +847,38 @@ const sidePanelVisibility = {
          *
          * @param area - 'left' or 'right', the area of the side panel.
          * @param entryLabel - the name of the main entry in the View menu for that side panel.
-         * @returns - The disposable menu added to the View menu or null.
          */
         const updateMenu = (area, entryLabel) => {
             var _a;
             if (menu === null) {
-                return null;
+                return;
             }
             // Remove the previous menu entry for this side panel.
             (_a = sidePanelMenu[area]) === null || _a === void 0 ? void 0 : _a.dispose();
+            sidePanelMenu[area] = null;
+            // Nothing to add to the View menu if the side panel has no widget.
+            const widgets = Array.from(notebookShell.widgets(area));
+            if (widgets.length === 0) {
+                return;
+            }
             // Creates a new menu entry and populates it with side panel widgets.
             const newMenu = new Menu({ commands: app.commands });
             newMenu.title.label = entryLabel;
-            const widgets = notebookShell.widgets(area);
-            let menuToAdd = false;
             for (const widget of widgets) {
                 newMenu.addItem({
                     command: CommandIDs.togglePanel,
                     args: {
                         side: area,
-                        title: `Show ${widget.title.caption}`,
+                        title: widget.title.caption,
                         id: widget.id,
                     },
                 });
-                menuToAdd = true;
-            }
-            // If there are widgets, add the menu to the main menu entry.
-            if (menuToAdd) {
-                sidePanelMenu[area] = menu.viewMenu.addItem({
-                    type: 'submenu',
-                    submenu: newMenu,
-                });
             }
+            // Add the menu to the main menu entry.
+            sidePanelMenu[area] = menu.viewMenu.addItem({
+                type: 'submenu',
+                submenu: newMenu,
+            });
         };
         app.restored.then(() => {
             // Create menu entries for the left and right panel.
@@ -880,6 +911,7 @@ const sidePanelVisibility = {
                 const sidePanelPalette = new SidePanelPalette({
                     commandPalette: palette,
                     command: CommandIDs.togglePanel,
+                    translator,
                 });
                 notebookShell.leftHandler.widgets.forEach((widget) => {
                     sidePanelPalette.addItem(widget, notebookShell.leftHandler.area);
@@ -1055,7 +1087,10 @@ const zen = {
             }
         });
         if (palette) {
-            palette.addItem({ command: CommandIDs.toggleZen, category: 'Mode' });
+            palette.addItem({
+                command: CommandIDs.toggleZen,
+                category: trans.__('Mode'),
+            });
         }
     },
 };

package/lib/settingconnector.d.ts

@@ -1,21 +1,15 @@
-import type { ISettingConnector, ISettingRegistry } from '@jupyterlab/settingregistry';
-import type { IDataConnector } from '@jupyterlab/statedb';
-import { DataConnector } from '@jupyterlab/statedb';
+import { ISettingRegistry, SettingConnector as BaseSettingConnector } from '@jupyterlab/settingregistry';
 /**
  * A data connector for fetching settings.
  *
  * #### Notes
- * This connector is based on the default JupyterLab setting connector,
- * and additionally overrides the default values of some settings.
+ * This connector extends the default JupyterLab setting connector with
+ * Jupyter Notebook-specific overrides.
  */
-export declare class SettingConnector extends DataConnector<ISettingRegistry.IPlugin, string> implements ISettingConnector {
-    constructor(connector: IDataConnector<ISettingRegistry.IPlugin, string>);
+export declare class SettingConnector extends BaseSettingConnector {
     /**
      * Fetch settings for a plugin.
      * @param id - The plugin ID
-     *
-     * #### Notes
-     * The REST API requests are throttled at one request per plugin per 100ms.
      */
     fetch(id: string): Promise<ISettingRegistry.IPlugin | undefined>;
     list(query: 'ids'): Promise<{
@@ -25,7 +19,4 @@ export declare class SettingConnector extends DataConnector<ISettingRegistry.IPl
         ids: string[];
         values: ISettingRegistry.IPlugin[];
     }>;
-    save(id: string, raw: string): Promise<void>;
-    private _connector;
-    private _throttlers;
 }

package/lib/settingconnector.js

@@ -1,8 +1,7 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 import { PageConfig } from '@jupyterlab/coreutils';
-import { DataConnector } from '@jupyterlab/statedb';
-import { Throttler } from '@lumino/polling';
+import { SettingConnector as BaseSettingConnector, } from '@jupyterlab/settingregistry';
 /**
  * The default setting values overridden in Jupyter Notebook, mapping
  * a plugin identifier to the overridden properties.
@@ -21,54 +20,30 @@ const SETTING_OVERRIDES = {
         helpInBottomPanel: true,
     },
 };
+const FILE_EDITOR_PLUGIN_ID = '@jupyterlab/fileeditor-extension:plugin';
+const SYNTAX_HIGHLIGHTING_SUBMENU_ID = 'jp-mainmenu-view-codemirror-language';
 /**
  * A data connector for fetching settings.
  *
  * #### Notes
- * This connector is based on the default JupyterLab setting connector,
- * and additionally overrides the default values of some settings.
+ * This connector extends the default JupyterLab setting connector with
+ * Jupyter Notebook-specific overrides.
  */
-export class SettingConnector extends DataConnector {
-    constructor(connector) {
-        super();
-        this._throttlers = Object.create(null);
-        this._connector = connector;
-    }
+export class SettingConnector extends BaseSettingConnector {
     /**
      * Fetch settings for a plugin.
      * @param id - The plugin ID
-     *
-     * #### Notes
-     * The REST API requests are throttled at one request per plugin per 100ms.
      */
-    fetch(id) {
-        const throttlers = this._throttlers;
-        if (!(id in throttlers)) {
-            throttlers[id] = new Throttler(async () => {
-                const plugin = await this._connector.fetch(id);
-                return plugin && Private.overrideDefaults(plugin);
-            }, 100);
-        }
-        return throttlers[id].invoke();
+    async fetch(id) {
+        const plugin = await super.fetch(id);
+        return plugin && Private.applyOverrides(plugin);
     }
     async list(query = 'all') {
-        const { isDisabled } = PageConfig.Extension;
-        const { ids, values } = await this._connector.list(query === 'ids' ? 'ids' : undefined);
         if (query === 'ids') {
-            return { ids };
-        }
-        if (query === 'all') {
-            return { ids, values: values.map(Private.overrideDefaults) };
+            return super.list(query);
         }
-        return {
-            ids: ids.filter((id) => !isDisabled(id)),
-            values: values
-                .filter(({ id }) => !isDisabled(id))
-                .map(Private.overrideDefaults),
-        };
-    }
-    async save(id, raw) {
-        await this._connector.save(id, raw);
+        const { ids, values } = await super.list(query);
+        return { ids, values: values.map(Private.applyOverrides) };
     }
 }
 /**
@@ -76,6 +51,10 @@ export class SettingConnector extends DataConnector {
  */
 var Private;
 (function (Private) {
+    function applyOverrides(plugin) {
+        return hideSyntaxHighlightingMenu(overrideDefaults(plugin));
+    }
+    Private.applyOverrides = applyOverrides;
     /**
      * Override the default values of the plugin settings listed
      * in `SETTING_OVERRIDES`.
@@ -93,5 +72,21 @@ var Private;
         }
         return plugin;
     }
-    Private.overrideDefaults = overrideDefaults;
+    function hideSyntaxHighlightingMenu(plugin) {
+        var _a, _b, _c, _d;
+        const page = PageConfig.getOption('notebookPage');
+        if (plugin.id !== FILE_EDITOR_PLUGIN_ID || page === 'edit') {
+            return plugin;
+        }
+        const menus = (_b = (_a = plugin.schema['jupyter.lab.menus']) === null || _a === void 0 ? void 0 : _a.main) !== null && _b !== void 0 ? _b : [];
+        for (const menu of menus) {
+            for (const item of (_c = menu.items) !== null && _c !== void 0 ? _c : []) {
+                if (item.type === 'submenu' &&
+                    ((_d = item.submenu) === null || _d === void 0 ? void 0 : _d.id) === SYNTAX_HIGHLIGHTING_SUBMENU_ID) {
+                    item.disabled = true;
+                }
+            }
+        }
+        return plugin;
+    }
 })(Private || (Private = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyter-notebook/application-extension",
-  "version": "7.7.0-alpha.1",
+  "version": "7.7.0-beta.0",
   "description": "Jupyter Notebook - Application Extension",
   "homepage": "https://github.com/jupyter/notebook",
   "bugs": {
@@ -38,23 +38,21 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@jupyter-notebook/application": "^7.7.0-alpha.1",
-    "@jupyter-notebook/ui-components": "^7.7.0-alpha.1",
-    "@jupyterlab/application": "~4.7.0-alpha.1",
-    "@jupyterlab/apputils": "~4.8.0-alpha.1",
-    "@jupyterlab/codeeditor": "~4.7.0-alpha.1",
-    "@jupyterlab/console": "~4.7.0-alpha.1",
-    "@jupyterlab/coreutils": "~6.7.0-alpha.1",
-    "@jupyterlab/docmanager": "~4.7.0-alpha.1",
-    "@jupyterlab/docregistry": "~4.7.0-alpha.1",
-    "@jupyterlab/mainmenu": "~4.7.0-alpha.1",
-    "@jupyterlab/rendermime": "~4.7.0-alpha.1",
-    "@jupyterlab/settingregistry": "~4.7.0-alpha.1",
-    "@jupyterlab/statedb": "~4.7.0-alpha.1",
-    "@jupyterlab/translation": "~4.7.0-alpha.1",
+    "@jupyter-notebook/application": "^7.7.0-beta.0",
+    "@jupyter-notebook/ui-components": "^7.7.0-beta.0",
+    "@jupyterlab/application": "~4.7.0-beta.0",
+    "@jupyterlab/apputils": "~4.8.0-beta.0",
+    "@jupyterlab/codeeditor": "~4.7.0-beta.0",
+    "@jupyterlab/console": "~4.7.0-beta.0",
+    "@jupyterlab/coreutils": "~6.7.0-beta.0",
+    "@jupyterlab/docmanager": "~4.7.0-beta.0",
+    "@jupyterlab/docregistry": "~4.7.0-beta.0",
+    "@jupyterlab/mainmenu": "~4.7.0-beta.0",
+    "@jupyterlab/rendermime": "~4.7.0-beta.0",
+    "@jupyterlab/settingregistry": "~4.7.0-beta.0",
+    "@jupyterlab/translation": "~4.7.0-beta.0",
     "@lumino/coreutils": "^2.2.2",
     "@lumino/disposable": "^2.1.5",
-    "@lumino/polling": "^2.1.5",
     "@lumino/widgets": "^2.7.2"
   },
   "devDependencies": {

package/schema/shell.json

@@ -20,20 +20,34 @@
   "definitions": {
     "layout": {
       "type": "object",
-      "properties": {
+      "patternProperties": {
         "[\\w-]+": {
           "type": "object",
           "properties": {
             "area": {
+              "type": "string",
               "oneOf": [
+                { "const": "main", "title": "Main" },
+                { "const": "top", "title": "Top" },
+                { "const": "menu", "title": "Menu" },
                 { "const": "left", "title": "Left" },
-                { "const": "right", "title": "Right" }
+                { "const": "right", "title": "Right" },
+                { "const": "down", "title": "Down" }
               ]
+            },
+            "options": {
+              "$ref": "#/definitions/options"
             }
           },
           "additionalProperties": false
         }
       }
+    },
+    "options": {
+      "type": "object",
+      "properties": {
+        "rank": { "type": "number", "minimum": 0 }
+      }
     }
   }
 }

package/schema/top.json

@@ -21,6 +21,7 @@
       "title": "Top Bar Visibility",
       "description": "Whether to show the top bar or not, yes for always showing, no for always not showing, automatic for adjusting to screen size",
       "default": "automatic",
+      "type": "string",
       "oneOf": [
         { "const": "yes", "title": "Yes" },
         { "const": "no", "title": "No" },