@jupyter-notebook/notebook-extension 7.6.0-alpha.4 → 7.6.0-beta.0

package/lib/index.js

@@ -1,6 +1,6 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
-import { DOMUtils, IToolbarWidgetRegistry, ICommandPalette, } from '@jupyterlab/apputils';
+import { Dialog, DOMUtils, IToolbarWidgetRegistry, ICommandPalette, showDialog, } from '@jupyterlab/apputils';
 import { PageConfig, Text, Time, URLExt } from '@jupyterlab/coreutils';
 import { IDebuggerSidebar } from '@jupyterlab/debugger';
 import { IDocumentManager } from '@jupyterlab/docmanager';
@@ -169,19 +169,57 @@ const closeTab = {
     description: 'Add a command to close the browser tab when clicking on "Close and Shut Down".',
     autoStart: true,
     requires: [IMainMenu],
-    optional: [ITranslator],
-    activate: (app, menu, translator) => {
+    optional: [INotebookTracker, ISettingRegistry, ITranslator],
+    activate: (app, menu, tracker, settingRegistry, translator) => {
         const { commands } = app;
         translator = translator !== null && translator !== void 0 ? translator : nullTranslator;
         const trans = translator.load('notebook');
+        let promptForConfirmation = true;
+        if (settingRegistry) {
+            const loadSettings = settingRegistry.load(closeTab.id);
+            const updateSettings = (settings) => {
+                promptForConfirmation = settings.get('promptForConfirmation')
+                    .composite;
+            };
+            Promise.all([loadSettings, app.restored])
+                .then(([settings]) => {
+                updateSettings(settings);
+                settings.changed.connect(updateSettings);
+            })
+                .catch((reason) => {
+                console.error(`Failed to load settings for ${closeTab.id}: ${reason.message}`);
+            });
+        }
         const id = 'notebook:close-and-halt';
         commands.addCommand(id, {
-            label: trans.__('Close and Shut Down Notebook'),
+            label: () => promptForConfirmation
+                ? trans.__('Close and Shut Down Notebook…')
+                : trans.__('Close and Shut Down Notebook'),
             execute: async () => {
-                // Shut the kernel down, without confirmation
+                var _a, _b;
+                if (promptForConfirmation) {
+                    const fileName = (_b = (_a = tracker === null || tracker === void 0 ? void 0 : tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.title.label) !== null && _b !== void 0 ? _b : trans.__('the notebook');
+                    const result = await showDialog({
+                        title: trans.__('Shut down the notebook?'),
+                        body: trans.__('Are you sure you want to close "%1"?', fileName),
+                        buttons: [
+                            Dialog.cancelButton(),
+                            Dialog.warnButton({ label: trans.__('Shut Down') }),
+                        ],
+                    });
+                    if (!result.button.accept) {
+                        return;
+                    }
+                }
                 await commands.execute('notebook:shutdown-kernel', { activate: false });
                 window.close();
             },
+            describedBy: {
+                args: {
+                    type: 'object',
+                    properties: {},
+                },
+            },
         });
         menu.fileMenu.closeAndCleaners.add({
             id,
@@ -210,6 +248,12 @@ const openTreeTab = {
                 const url = URLExt.join(PageConfig.getBaseUrl(), 'tree');
                 window.open(url);
             },
+            describedBy: {
+                args: {
+                    type: 'object',
+                    properties: {},
+                },
+            },
         });
     },
 };
@@ -266,6 +310,12 @@ const fullWidthNotebook = {
             },
             isEnabled: () => tracker.currentWidget !== null,
             isToggled: () => fullWidth,
+            describedBy: {
+                args: {
+                    type: 'object',
+                    properties: {},
+                },
+            },
         });
         if (palette) {
             palette.addItem({
@@ -582,6 +632,12 @@ const editNotebookMetadata = {
             },
             isVisible: () => shell.currentWidget !== null &&
                 shell.currentWidget instanceof NotebookPanel,
+            describedBy: {
+                args: {
+                    type: 'object',
+                    properties: {},
+                },
+            },
         });
         if (palette) {
             palette.addItem({

package/package.json

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

package/schema/close-tab.json

@@ -0,0 +1,14 @@
+{
+  "title": "Close and Shut Down Notebook",
+  "description": "Settings for the \"Close and Shut Down Notebook\" command.",
+  "properties": {
+    "promptForConfirmation": {
+      "type": "boolean",
+      "title": "Prompt for confirmation before closing and shutting down",
+      "description": "Whether to prompt the user for confirmation before closing the browser tab and shutting down the kernel.",
+      "default": true
+    }
+  },
+  "additionalProperties": false,
+  "type": "object"
+}