@jupyter-notebook/notebook-extension 7.0.0-alpha.9 → 7.0.0-beta.1

package/lib/index.js

@@ -1,14 +1,15 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
-import { DOMUtils, IToolbarWidgetRegistry } from '@jupyterlab/apputils';
+import { DOMUtils, IToolbarWidgetRegistry, } from '@jupyterlab/apputils';
 import { Text, Time } from '@jupyterlab/coreutils';
 import { IDocumentManager } from '@jupyterlab/docmanager';
-import { NotebookPanel, INotebookTracker, INotebookTools } from '@jupyterlab/notebook';
+import { NotebookPanel, INotebookTracker, INotebookTools, } from '@jupyterlab/notebook';
 import { ISettingRegistry } from '@jupyterlab/settingregistry';
 import { ITranslator } from '@jupyterlab/translation';
 import { INotebookShell } from '@jupyter-notebook/application';
 import { Poll } from '@lumino/polling';
 import { Widget } from '@lumino/widgets';
+import { TrustedComponent } from './trusted';
 /**
  * The class for kernel status errors.
  */
@@ -42,7 +43,7 @@ const checkpoints = {
         const trans = translator.load('notebook');
         const node = document.createElement('div');
         if (toolbarRegistry) {
-            toolbarRegistry.addFactory('TopBar', 'checkpoint', toolbar => {
+            toolbarRegistry.addFactory('TopBar', 'checkpoint', (toolbar) => {
                 const widget = new Widget({ node });
                 widget.id = DOMUtils.createDomID();
                 widget.addClass('jp-NotebookCheckpoint');
@@ -72,11 +73,11 @@ const checkpoints = {
             factory: () => onChange(),
             frequency: {
                 interval: 2000,
-                backoff: false
+                backoff: false,
             },
-            standby: 'when-hidden'
+            standby: 'when-hidden',
         });
-    }
+    },
 };
 /**
  * The kernel logo plugin.
@@ -90,30 +91,34 @@ const kernelLogo = {
         const { serviceManager } = app;
         const node = document.createElement('div');
         const img = document.createElement('img');
-        node.appendChild(img);
         const onChange = async () => {
             var _a, _b, _c, _d, _e;
             const current = shell.currentWidget;
             if (!(current instanceof NotebookPanel)) {
                 return;
             }
+            if (!node.hasChildNodes()) {
+                node.appendChild(img);
+            }
             await current.sessionContext.ready;
             current.sessionContext.kernelChanged.disconnect(onChange);
             current.sessionContext.kernelChanged.connect(onChange);
             const name = (_c = (_b = (_a = current.sessionContext.session) === null || _a === void 0 ? void 0 : _a.kernel) === null || _b === void 0 ? void 0 : _b.name) !== null && _c !== void 0 ? _c : '';
             const spec = (_e = (_d = serviceManager.kernelspecs) === null || _d === void 0 ? void 0 : _d.specs) === null || _e === void 0 ? void 0 : _e.kernelspecs[name];
             if (!spec) {
+                node.childNodes[0].remove();
                 return;
             }
             const kernelIconUrl = spec.resources['logo-64x64'];
             if (!kernelIconUrl) {
+                node.childNodes[0].remove();
                 return;
             }
             img.src = kernelIconUrl;
             img.title = spec.display_name;
         };
         if (toolbarRegistry) {
-            toolbarRegistry.addFactory('TopBar', 'kernelLogo', toolbar => {
+            toolbarRegistry.addFactory('TopBar', 'kernelLogo', (toolbar) => {
                 const widget = new Widget({ node });
                 widget.addClass('jp-NotebookKernelLogo');
                 return widget;
@@ -122,7 +127,7 @@ const kernelLogo = {
         app.started.then(() => {
             shell.currentChanged.connect(onChange);
         });
-    }
+    },
 };
 /**
  * A plugin to display the kernel status;
@@ -175,7 +180,7 @@ const kernelStatus = {
             sessionContext.statusChanged.connect(onStatusChanged);
         };
         shell.currentChanged.connect(onChange);
-    }
+    },
 };
 /**
  * A plugin to enable scrolling for outputs by default.
@@ -243,7 +248,7 @@ const scrollOutput = {
             Promise.all([loadSettings, app.restored])
                 .then(([settings]) => {
                 updateSettings(settings);
-                settings.changed.connect(settings => {
+                settings.changed.connect((settings) => {
                     updateSettings(settings);
                 });
             })
@@ -251,7 +256,7 @@ const scrollOutput = {
                 console.error(reason.message);
             });
         }
-    }
+    },
 };
 /**
  * A plugin to add the NotebookTools to the side panel;
@@ -273,7 +278,28 @@ const notebookToolsWidget = {
             }
         };
         shell.currentChanged.connect(onChange);
-    }
+    },
+};
+/**
+ * A plugin that adds a Trusted indicator to the menu area
+ */
+const trusted = {
+    id: '@jupyter-notebook/notebook-extension:trusted',
+    autoStart: true,
+    requires: [INotebookShell, ITranslator],
+    activate: (app, notebookShell, translator) => {
+        const onChange = async () => {
+            const current = notebookShell.currentWidget;
+            if (!(current instanceof NotebookPanel)) {
+                return;
+            }
+            const notebook = current.content;
+            await current.context.ready;
+            const widget = TrustedComponent.create({ notebook, translator });
+            notebookShell.add(widget, 'menu', { rank: 11000 });
+        };
+        notebookShell.currentChanged.connect(onChange);
+    },
 };
 /**
  * Export the plugins as default.
@@ -283,6 +309,7 @@ const plugins = [
     kernelLogo,
     kernelStatus,
     scrollOutput,
-    notebookToolsWidget
+    notebookToolsWidget,
+    trusted,
 ];
 export default plugins;

package/lib/trusted.d.ts

@@ -0,0 +1,18 @@
+import { ReactWidget } from '@jupyterlab/apputils';
+import { Notebook } from '@jupyterlab/notebook';
+import { ITranslator } from '@jupyterlab/translation';
+/**
+ * A namespace for TrustedComponent statics.
+ */
+export declare namespace TrustedComponent {
+    /**
+     * Create a new TrustedComponent
+     *
+     * @param notebook The notebook
+     * @param translator The translator
+     */
+    const create: ({ notebook, translator, }: {
+        notebook: Notebook;
+        translator: ITranslator;
+    }) => ReactWidget;
+}

package/lib/trusted.js

@@ -0,0 +1,69 @@
+import { ReactWidget } from '@jupyterlab/apputils';
+import { NotebookActions } from '@jupyterlab/notebook';
+import React, { useEffect, useState } from 'react';
+/**
+ * Check if a notebook is trusted
+ * @param notebook The notebook to check
+ * @returns true if the notebook is trusted, false otherwise
+ */
+const isTrusted = (notebook) => {
+    const model = notebook.model;
+    if (!model) {
+        return false;
+    }
+    const cells = Array.from(model.cells);
+    const trusted = cells.reduce((accum, current) => {
+        if (current.trusted) {
+            return accum + 1;
+        }
+        else {
+            return accum;
+        }
+    }, 0);
+    const total = cells.length;
+    return trusted === total;
+};
+/**
+ * A React component to display the Trusted badge in the menu bar.
+ * @param notebook The Notebook
+ * @param translator The Translation service
+ */
+const TrustedButton = ({ notebook, translator, }) => {
+    const trans = translator.load('notebook');
+    const [trusted, setTrusted] = useState(isTrusted(notebook));
+    const checkTrust = () => {
+        const v = isTrusted(notebook);
+        setTrusted(v);
+    };
+    const trust = async () => {
+        await NotebookActions.trust(notebook, translator);
+        checkTrust();
+    };
+    useEffect(() => {
+        notebook.modelContentChanged.connect(checkTrust);
+        notebook.activeCellChanged.connect(checkTrust);
+        checkTrust();
+        return () => {
+            notebook.modelContentChanged.disconnect(checkTrust);
+            notebook.activeCellChanged.disconnect(checkTrust);
+        };
+    });
+    return (React.createElement("button", { className: 'jp-NotebookTrustedStatus', style: !trusted ? { cursor: 'pointer' } : { cursor: 'help' }, onClick: () => !trusted && trust(), title: trusted
+            ? trans.__('JavaScript enabled for notebook display')
+            : trans.__('JavaScript disabled for notebook display') }, trusted ? trans.__('Trusted') : trans.__('Not Trusted')));
+};
+/**
+ * A namespace for TrustedComponent statics.
+ */
+export var TrustedComponent;
+(function (TrustedComponent) {
+    /**
+     * Create a new TrustedComponent
+     *
+     * @param notebook The notebook
+     * @param translator The translator
+     */
+    TrustedComponent.create = ({ notebook, translator, }) => {
+        return ReactWidget.create(React.createElement(TrustedButton, { notebook: notebook, translator: translator }));
+    };
+})(TrustedComponent || (TrustedComponent = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyter-notebook/notebook-extension",
-  "version": "7.0.0-alpha.9",
+  "version": "7.0.0-beta.1",
   "description": "Jupyter Notebook - Notebook Extension",
   "homepage": "https://github.com/jupyter/notebook",
   "bugs": {
@@ -35,24 +35,23 @@
     "build:prod": "tsc -b",
     "clean": "rimraf lib && rimraf tsconfig.tsbuildinfo",
     "docs": "typedoc src",
-    "prepublishOnly": "npm run build",
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@jupyter-notebook/application": "^7.0.0-alpha.9",
-    "@jupyterlab/application": "^4.0.0-alpha.16",
-    "@jupyterlab/apputils": "^4.0.0-alpha.16",
-    "@jupyterlab/cells": "^4.0.0-alpha.16",
-    "@jupyterlab/docmanager": "^4.0.0-alpha.16",
-    "@jupyterlab/notebook": "^4.0.0-alpha.16",
-    "@jupyterlab/settingregistry": "^4.0.0-alpha.16",
-    "@jupyterlab/translation": "^4.0.0-alpha.16",
-    "@lumino/polling": "^2.0.0-alpha.6",
-    "@lumino/widgets": "^2.0.0-alpha.6"
+    "@jupyter-notebook/application": "^7.0.0-beta.1",
+    "@jupyterlab/application": "^4.0.0-rc.0",
+    "@jupyterlab/apputils": "^4.0.0-rc.0",
+    "@jupyterlab/cells": "^4.0.0-rc.0",
+    "@jupyterlab/docmanager": "^4.0.0-rc.0",
+    "@jupyterlab/notebook": "^4.0.0-rc.0",
+    "@jupyterlab/settingregistry": "^4.0.0-rc.0",
+    "@jupyterlab/translation": "^4.0.0-rc.0",
+    "@lumino/polling": "^2.1.1",
+    "@lumino/widgets": "^2.1.1"
   },
   "devDependencies": {
     "rimraf": "^3.0.2",
-    "typescript": "~4.7.3"
+    "typescript": "~5.0.2"
   },
   "publishConfig": {
     "access": "public"

package/style/base.css

@@ -122,6 +122,15 @@ body[data-notebook='notebooks']
   }
 }
 
+/* Tweak the notebook footer (to add a new cell) */
+body[data-notebook='notebooks'] .jp-Notebook-footer {
+  /* TODO: re-enable */
+  display: none;
+  width: 100%;
+  margin-left: unset;
+  background: unset;
+}
+
 /* Mobile View */
 
 body[data-format='mobile'] .jp-NotebookCheckpoint {
@@ -132,6 +141,10 @@ body[data-format='mobile'] .jp-Notebook > *:first-child {
   margin-top: 0;
 }
 
+body[data-format='mobile'] .jp-ToolbarButton .jp-DebuggerBugButton {
+  display: none;
+}
+
 /* Virtual Notebook fixes */
 
 body[data-notebook='notebooks'] .jp-WindowedPanel-window {
@@ -216,6 +229,19 @@ body[data-notebook='notebooks']
   animation: 0.5s fade-out forwards;
 }
 
+.jp-NotebookTrustedStatus {
+  background: var(--jp-layout-color1);
+  color: var(--jp-ui-font-color1);
+  margin-top: 4px;
+  margin-bottom: 4px;
+  border: solid 1px var(--jp-border-color2);
+  cursor: help;
+}
+
+.jp-NotebookTrustedStatus-not-trusted {
+  cursor: pointer;
+}
+
 @keyframes fade-out {
   0% {
     opacity: 1;