@jupyterlab/extensionmanager-extension 4.0.0-alpha.9 → 4.0.0-beta.1

package/lib/index.js

@@ -4,11 +4,11 @@
  * @packageDocumentation
  * @module extensionmanager-extension
  */
-import { ILabShell, ILayoutRestorer } from '@jupyterlab/application';
+import { ILayoutRestorer } from '@jupyterlab/application';
 import { Dialog, ICommandPalette, showDialog } from '@jupyterlab/apputils';
-import { ExtensionView } from '@jupyterlab/extensionmanager';
+import { ExtensionsPanel, ListModel } from '@jupyterlab/extensionmanager';
 import { ISettingRegistry } from '@jupyterlab/settingregistry';
-import { ITranslator } from '@jupyterlab/translation';
+import { ITranslator, nullTranslator } from '@jupyterlab/translation';
 import { extensionIcon } from '@jupyterlab/ui-components';
 const PLUGIN_ID = '@jupyterlab/extensionmanager-extension:plugin';
 /**
@@ -25,52 +25,71 @@ var CommandIDs;
 const plugin = {
     id: PLUGIN_ID,
     autoStart: true,
-    requires: [ISettingRegistry, ITranslator],
-    optional: [ILabShell, ILayoutRestorer, ICommandPalette],
-    activate: async (app, registry, translator, labShell, restorer, palette) => {
+    requires: [ISettingRegistry],
+    optional: [ITranslator, ILayoutRestorer, ICommandPalette],
+    activate: async (app, registry, translator, restorer, palette) => {
+        const { commands, shell, serviceManager } = app;
+        translator = translator !== null && translator !== void 0 ? translator : nullTranslator;
         const trans = translator.load('jupyterlab');
-        const settings = await registry.load(plugin.id);
-        let enabled = settings.composite['enabled'] === true;
-        const { commands, serviceManager } = app;
-        let view;
+        const model = new ListModel(serviceManager, translator);
         const createView = () => {
-            const v = new ExtensionView(app, serviceManager, settings, translator);
+            const v = new ExtensionsPanel({ model, translator: translator });
             v.id = 'extensionmanager.main-view';
             v.title.icon = extensionIcon;
             v.title.caption = trans.__('Extension Manager');
+            v.node.setAttribute('role', 'region');
+            v.node.setAttribute('aria-label', trans.__('Extension Manager section'));
             if (restorer) {
                 restorer.add(v, v.id);
             }
+            shell.add(v, 'left', { rank: 1000 });
             return v;
         };
-        if (enabled && labShell) {
-            view = createView();
-            view.node.setAttribute('role', 'region');
-            view.node.setAttribute('aria-label', trans.__('Extension Manager section'));
-            labShell.add(view, 'left', { rank: 1000 });
-        }
+        // Create a view by default, so it can be restored when loading the workspace.
+        let view = createView();
         // If the extension is enabled or disabled,
         // add or remove it from the left area.
         Promise.all([app.restored, registry.load(PLUGIN_ID)])
             .then(([, settings]) => {
+            model.isDisclaimed = settings.get('disclaimed').composite;
+            model.isEnabled = settings.get('enabled').composite;
+            model.stateChanged.connect(() => {
+                if (model.isDisclaimed !==
+                    settings.get('disclaimed').composite) {
+                    settings.set('disclaimed', model.isDisclaimed).catch(reason => {
+                        console.error(`Failed to set setting 'disclaimed'.\n${reason}`);
+                    });
+                }
+                if (model.isEnabled !== settings.get('enabled').composite) {
+                    settings.set('enabled', model.isEnabled).catch(reason => {
+                        console.error(`Failed to set setting 'enabled'.\n${reason}`);
+                    });
+                }
+            });
+            if (model.isEnabled) {
+                view = view !== null && view !== void 0 ? view : createView();
+            }
+            else {
+                view === null || view === void 0 ? void 0 : view.dispose();
+                view = null;
+            }
             settings.changed.connect(async () => {
-                enabled = settings.composite['enabled'] === true;
-                if (enabled && !(view === null || view === void 0 ? void 0 : view.isAttached)) {
-                    const accepted = await Private.showWarning(trans);
-                    if (!accepted) {
-                        void settings.set('enabled', false);
-                        return;
-                    }
-                    view = view || createView();
-                    view.node.setAttribute('role', 'region');
-                    view.node.setAttribute('aria-label', trans.__('Extension Manager section'));
-                    if (labShell) {
-                        labShell.add(view, 'left', { rank: 1000 });
+                model.isDisclaimed = settings.get('disclaimed').composite;
+                model.isEnabled = settings.get('enabled').composite;
+                app.commands.notifyCommandChanged(CommandIDs.toggle);
+                if (model.isEnabled) {
+                    if (view === null || !view.isAttached) {
+                        const accepted = await Private.showWarning(trans);
+                        if (!accepted) {
+                            void settings.set('enabled', false);
+                            return;
+                        }
                     }
+                    view = view !== null && view !== void 0 ? view : createView();
                 }
-                else if (!enabled && (view === null || view === void 0 ? void 0 : view.isAttached)) {
-                    app.commands.notifyCommandChanged(CommandIDs.toggle);
-                    view.close();
+                else {
+                    view === null || view === void 0 ? void 0 : view.dispose();
+                    view = null;
                 }
             });
         })
@@ -81,25 +100,25 @@ const plugin = {
             label: trans.__('Extension Manager'),
             execute: () => {
                 if (view) {
-                    labShell === null || labShell === void 0 ? void 0 : labShell.activateById(view.id);
+                    shell.activateById(view.id);
                 }
             },
-            isVisible: () => enabled && labShell !== null
+            isVisible: () => model.isEnabled
         });
         commands.addCommand(CommandIDs.toggle, {
             label: trans.__('Enable Extension Manager'),
             execute: () => {
                 if (registry) {
-                    void registry.set(plugin.id, 'enabled', !enabled);
+                    void registry.set(plugin.id, 'enabled', !model.isEnabled);
                 }
             },
-            isToggled: () => enabled,
-            isEnabled: () => serviceManager.builder.isAvailable
+            isToggled: () => model.isEnabled
         });
-        const category = trans.__('Extension Manager');
-        const command = CommandIDs.toggle;
         if (palette) {
-            palette.addItem({ command, category });
+            palette.addItem({
+                command: CommandIDs.toggle,
+                category: trans.__('Extension Manager')
+            });
         }
     }
 };
@@ -118,7 +137,7 @@ var Private;
      * @returns whether the user accepted the dialog.
      */
     async function showWarning(trans) {
-        return showDialog({
+        const result = await showDialog({
             title: trans.__('Enable Extension Manager?'),
             body: trans.__(`Thanks for trying out JupyterLab's extension manager.
 The JupyterLab development team is excited to have a robust
@@ -130,9 +149,8 @@ Do you want to continue?`),
                 Dialog.cancelButton({ label: trans.__('Disable') }),
                 Dialog.warnButton({ label: trans.__('Enable') })
             ]
-        }).then(result => {
-            return result.button.accept;
         });
+        return result.button.accept;
     }
     Private.showWarning = showWarning;
 })(Private || (Private = {}));

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyterlab/extensionmanager-extension",
-  "version": "4.0.0-alpha.9",
+  "version": "4.0.0-beta.1",
   "description": "JupyterLab - Extension Manager Extension",
   "homepage": "https://github.com/jupyterlab/jupyterlab",
   "bugs": {
@@ -29,7 +29,8 @@
     "schema/*.json",
     "listing/*.json",
     "style/*.css",
-    "style/index.js"
+    "style/index.js",
+    "src/**/*.{ts,tsx}"
   ],
   "scripts": {
     "build": "tsc -b",
@@ -38,17 +39,17 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@jupyterlab/application": "^4.0.0-alpha.9",
-    "@jupyterlab/apputils": "^4.0.0-alpha.9",
-    "@jupyterlab/extensionmanager": "^4.0.0-alpha.9",
-    "@jupyterlab/settingregistry": "^4.0.0-alpha.9",
-    "@jupyterlab/translation": "^4.0.0-alpha.9",
-    "@jupyterlab/ui-components": "^4.0.0-alpha.24"
+    "@jupyterlab/application": "^4.0.0-beta.1",
+    "@jupyterlab/apputils": "^4.0.0-beta.1",
+    "@jupyterlab/extensionmanager": "^4.0.0-beta.1",
+    "@jupyterlab/settingregistry": "^4.0.0-beta.1",
+    "@jupyterlab/translation": "^4.0.0-beta.1",
+    "@jupyterlab/ui-components": "^4.0.0-beta.1"
   },
   "devDependencies": {
     "rimraf": "~3.0.0",
-    "typedoc": "~0.22.10",
-    "typescript": "~4.6.3"
+    "typedoc": "~0.23.25",
+    "typescript": "~5.0.2"
   },
   "publishConfig": {
     "access": "public"

package/schema/plugin.json

@@ -1,7 +1,7 @@
 {
   "title": "Extension Manager",
   "description": "Extension manager settings.",
-  "jupyter.lab.setting-icon": "ui-components:settings",
+  "jupyter.lab.setting-icon": "ui-components:extension",
   "jupyter.lab.setting-icon-label": "Extension Manager",
   "jupyter.lab.menus": {
     "main": [
@@ -43,33 +43,15 @@
   "properties": {
     "enabled": {
       "title": "Enabled Status",
-      "description": "Enables extension manager (requires Node.js/npm).\nWARNING: installing untrusted extensions may be unsafe.",
+      "description": "Enables extension manager.\nWARNING: installing untrusted extensions may be unsafe.",
       "default": true,
       "type": "boolean"
     },
     "disclaimed": {
       "title": "Disclaimed Status",
-      "description": "Whether the user understand that extensions managed through this interface run arbitrary code that may be dangerous",
+      "description": "Whether the user agrees the access to external web services and understands extensions may introduce security risks or contain malicious code that runs on his machine.",
       "default": false,
       "type": "boolean"
-    },
-    "npmRegistry": {
-      "title": "NPM Registry",
-      "description": "The URI of the NPM registry to use for searching for jupyterlab extensions",
-      "default": "https://registry.npmjs.org/-/v1/",
-      "type": "string"
-    },
-    "npmCdn": {
-      "title": "NPM CDN",
-      "description": "The URI of the CDN to use for fetching full package data",
-      "default": "https://unpkg.com",
-      "type": "string"
-    },
-    "enableCdn": {
-      "title": "Enable CDN",
-      "description": "Enables using the CDN to fetch full package data.  Otherwise, the configured NPM registry will be used. Due to a lack of CORS support by NPM registry, only disable if supplying a custom registry",
-      "default": true,
-      "type": "boolean"
     }
   },
   "additionalProperties": false,

package/src/index.ts

@@ -0,0 +1,191 @@
+// Copyright (c) Jupyter Development Team.
+// Distributed under the terms of the Modified BSD License.
+/**
+ * @packageDocumentation
+ * @module extensionmanager-extension
+ */
+
+import {
+  ILayoutRestorer,
+  JupyterFrontEnd,
+  JupyterFrontEndPlugin
+} from '@jupyterlab/application';
+import { Dialog, ICommandPalette, showDialog } from '@jupyterlab/apputils';
+import { ExtensionsPanel, ListModel } from '@jupyterlab/extensionmanager';
+import { ISettingRegistry } from '@jupyterlab/settingregistry';
+import {
+  ITranslator,
+  nullTranslator,
+  TranslationBundle
+} from '@jupyterlab/translation';
+import { extensionIcon } from '@jupyterlab/ui-components';
+
+const PLUGIN_ID = '@jupyterlab/extensionmanager-extension:plugin';
+
+/**
+ * IDs of the commands added by this extension.
+ */
+namespace CommandIDs {
+  export const showPanel = 'extensionmanager:show-panel';
+  export const toggle = 'extensionmanager:toggle';
+}
+
+/**
+ * The extension manager plugin.
+ */
+const plugin: JupyterFrontEndPlugin<void> = {
+  id: PLUGIN_ID,
+  autoStart: true,
+  requires: [ISettingRegistry],
+  optional: [ITranslator, ILayoutRestorer, ICommandPalette],
+  activate: async (
+    app: JupyterFrontEnd,
+    registry: ISettingRegistry,
+    translator: ITranslator | null,
+    restorer: ILayoutRestorer | null,
+    palette: ICommandPalette | null
+  ) => {
+    const { commands, shell, serviceManager } = app;
+    translator = translator ?? nullTranslator;
+    const trans = translator.load('jupyterlab');
+
+    const model = new ListModel(serviceManager, translator);
+
+    const createView = () => {
+      const v = new ExtensionsPanel({ model, translator: translator! });
+      v.id = 'extensionmanager.main-view';
+      v.title.icon = extensionIcon;
+      v.title.caption = trans.__('Extension Manager');
+      v.node.setAttribute('role', 'region');
+      v.node.setAttribute('aria-label', trans.__('Extension Manager section'));
+      if (restorer) {
+        restorer.add(v, v.id);
+      }
+      shell.add(v, 'left', { rank: 1000 });
+
+      return v;
+    };
+
+    // Create a view by default, so it can be restored when loading the workspace.
+    let view: ExtensionsPanel | null = createView();
+
+    // If the extension is enabled or disabled,
+    // add or remove it from the left area.
+    Promise.all([app.restored, registry.load(PLUGIN_ID)])
+      .then(([, settings]) => {
+        model.isDisclaimed = settings.get('disclaimed').composite as boolean;
+        model.isEnabled = settings.get('enabled').composite as boolean;
+        model.stateChanged.connect(() => {
+          if (
+            model.isDisclaimed !==
+            (settings.get('disclaimed').composite as boolean)
+          ) {
+            settings.set('disclaimed', model.isDisclaimed).catch(reason => {
+              console.error(`Failed to set setting 'disclaimed'.\n${reason}`);
+            });
+          }
+          if (
+            model.isEnabled !== (settings.get('enabled').composite as boolean)
+          ) {
+            settings.set('enabled', model.isEnabled).catch(reason => {
+              console.error(`Failed to set setting 'enabled'.\n${reason}`);
+            });
+          }
+        });
+
+        if (model.isEnabled) {
+          view = view ?? createView();
+        } else {
+          view?.dispose();
+          view = null;
+        }
+
+        settings.changed.connect(async () => {
+          model.isDisclaimed = settings.get('disclaimed').composite as boolean;
+          model.isEnabled = settings.get('enabled').composite as boolean;
+          app.commands.notifyCommandChanged(CommandIDs.toggle);
+
+          if (model.isEnabled) {
+            if (view === null || !view.isAttached) {
+              const accepted = await Private.showWarning(trans);
+              if (!accepted) {
+                void settings.set('enabled', false);
+                return;
+              }
+            }
+            view = view ?? createView();
+          } else {
+            view?.dispose();
+            view = null;
+          }
+        });
+      })
+      .catch(reason => {
+        console.error(
+          `Something went wrong when reading the settings.\n${reason}`
+        );
+      });
+
+    commands.addCommand(CommandIDs.showPanel, {
+      label: trans.__('Extension Manager'),
+      execute: () => {
+        if (view) {
+          shell.activateById(view.id);
+        }
+      },
+      isVisible: () => model.isEnabled
+    });
+
+    commands.addCommand(CommandIDs.toggle, {
+      label: trans.__('Enable Extension Manager'),
+      execute: () => {
+        if (registry) {
+          void registry.set(plugin.id, 'enabled', !model.isEnabled);
+        }
+      },
+      isToggled: () => model.isEnabled
+    });
+
+    if (palette) {
+      palette.addItem({
+        command: CommandIDs.toggle,
+        category: trans.__('Extension Manager')
+      });
+    }
+  }
+};
+
+/**
+ * Export the plugin as the default.
+ */
+export default plugin;
+
+/**
+ * A namespace for module-private functions.
+ */
+namespace Private {
+  /**
+   * Show a warning dialog about extension security.
+   *
+   * @returns whether the user accepted the dialog.
+   */
+  export async function showWarning(
+    trans: TranslationBundle
+  ): Promise<boolean> {
+    const result = await showDialog({
+      title: trans.__('Enable Extension Manager?'),
+      body: trans.__(`Thanks for trying out JupyterLab's extension manager.
+The JupyterLab development team is excited to have a robust
+third-party extension community.
+However, we cannot vouch for every extension,
+and some may introduce security risks.
+Do you want to continue?`),
+      buttons: [
+        Dialog.cancelButton({ label: trans.__('Disable') }),
+        Dialog.warnButton({ label: trans.__('Enable') })
+      ]
+    });
+
+    return result.button.accept;
+  }
+}