@jupyterlab/apputils-extension 4.0.0-alpha.9 → 4.0.0-beta.0

package/lib/notificationplugin.js

@@ -0,0 +1,504 @@
+/*
+ * Copyright (c) Jupyter Development Team.
+ * Distributed under the terms of the Modified BSD License.
+ */
+import { Notification, ReactWidget } from '@jupyterlab/apputils';
+import { ISettingRegistry } from '@jupyterlab/settingregistry';
+import { GroupItem, IStatusBar, showPopup, TextItem } from '@jupyterlab/statusbar';
+import { ITranslator, nullTranslator } from '@jupyterlab/translation';
+import { bellIcon, Button, closeIcon, deleteIcon, ToolbarButtonComponent, UseSignal, VDomModel } from '@jupyterlab/ui-components';
+import { PromiseDelegate } from '@lumino/coreutils';
+import * as React from 'react';
+import { createRoot } from 'react-dom/client';
+/**
+ * Toast close button class
+ */
+const TOAST_CLOSE_BUTTON_CLASS = 'jp-Notification-Toast-Close';
+/**
+ * Maximal number of characters displayed in a notification.
+ */
+const MAX_MESSAGE_LENGTH = 140;
+var CommandIDs;
+(function (CommandIDs) {
+    /**
+     * Dismiss a notification
+     */
+    CommandIDs.dismiss = 'apputils:dismiss-notification';
+    /**
+     * Display all notifications
+     */
+    CommandIDs.display = 'apputils:display-notifications';
+    /**
+     * Create a notification
+     */
+    CommandIDs.notify = 'apputils:notify';
+    /**
+     * Update a notification
+     */
+    CommandIDs.update = 'apputils:update-notification';
+})(CommandIDs || (CommandIDs = {}));
+/**
+ * Half spacing between subitems in a status item.
+ */
+const HALF_SPACING = 4;
+/**
+ * Notification center view
+ */
+function NotificationCenter(props) {
+    const { manager, onClose, trans } = props;
+    // Markdown parsed notifications
+    const [notifications, setNotifications] = React.useState([]);
+    // Load asynchronously react-toastify icons
+    const [icons, setIcons] = React.useState(null);
+    React.useEffect(() => {
+        async function onChanged() {
+            setNotifications(await Promise.all(manager.notifications.map(async (n) => {
+                return Object.freeze({
+                    ...n
+                });
+            })));
+        }
+        if (notifications.length !== manager.count) {
+            void onChanged();
+        }
+        manager.changed.connect(onChanged);
+        return () => {
+            manager.changed.disconnect(onChanged);
+        };
+    }, [manager]);
+    React.useEffect(() => {
+        Private.getIcons()
+            .then(toastifyIcons => {
+            setIcons(toastifyIcons);
+        })
+            .catch(r => {
+            console.error(`Failed to get react-toastify icons:\n${r}`);
+        });
+    }, []);
+    return (React.createElement(UseSignal, { signal: manager.changed }, () => (React.createElement(React.Fragment, null,
+        React.createElement("h2", { className: "jp-Notification-Header jp-Toolbar" },
+            React.createElement("span", { className: "jp-Toolbar-item" }, manager.count > 0
+                ? trans._n('%1 notification', '%1 notifications', manager.count)
+                : trans.__('No notifications')),
+            React.createElement("span", { className: "jp-Toolbar-item jp-Toolbar-spacer" }),
+            React.createElement(ToolbarButtonComponent, { actualOnClick: true, onClick: () => {
+                    manager.dismiss();
+                }, icon: deleteIcon, tooltip: trans.__('Dismiss all notifications'), enabled: manager.count > 0 }),
+            React.createElement(ToolbarButtonComponent, { actualOnClick: true, onClick: onClose, icon: closeIcon, tooltip: trans.__('Hide notifications') })),
+        React.createElement("ol", { className: "jp-Notification-List" }, notifications.map(notification => {
+            var _a;
+            const { id, message, type, options } = notification;
+            const toastType = type === 'in-progress' ? 'default' : type;
+            const closeNotification = () => {
+                manager.dismiss(id);
+            };
+            const icon = type === 'default'
+                ? null
+                : type === 'in-progress'
+                    ? (_a = icons === null || icons === void 0 ? void 0 : icons.spinner) !== null && _a !== void 0 ? _a : null
+                    : icons && icons[type];
+            return (React.createElement("li", { className: "jp-Notification-List-Item", key: notification.id, onClick: event => {
+                    // Stop propagation to avoid closing the popup on click
+                    event.stopPropagation();
+                } },
+                React.createElement("div", { className: `Toastify__toast Toastify__toast-theme--light Toastify__toast--${toastType} jp-Notification-Toast-${toastType}` },
+                    React.createElement("div", { className: "Toastify__toast-body" },
+                        icon && (React.createElement("div", { className: "Toastify__toast-icon" }, icon({ theme: 'light', type: toastType }))),
+                        React.createElement("div", null, Private.createContent(message, closeNotification, options.actions))),
+                    React.createElement("button", { className: `jp-Button jp-mod-minimal ${TOAST_CLOSE_BUTTON_CLASS}`, title: trans.__('Dismiss notification'), onClick: closeNotification },
+                        React.createElement(deleteIcon.react, { className: "jp-icon-hover", tag: "span" })))));
+        }))))));
+}
+/**
+ * Status widget model
+ */
+class NotificationStatusModel extends VDomModel {
+    constructor(manager) {
+        super();
+        this.manager = manager;
+        this._highlight = false;
+        this._listOpened = false;
+        this._doNotDisturbMode = false;
+        this._count = manager.count;
+        this.manager.changed.connect(this.onNotificationChanged, this);
+    }
+    /**
+     * Number of notifications.
+     */
+    get count() {
+        return this._count;
+    }
+    /**
+     * Whether to silence all notifications or not.
+     */
+    get doNotDisturbMode() {
+        return this._doNotDisturbMode;
+    }
+    set doNotDisturbMode(v) {
+        this._doNotDisturbMode = v;
+    }
+    /**
+     * Whether to highlight the status widget or not.
+     */
+    get highlight() {
+        return this._highlight;
+    }
+    /**
+     * Whether the popup is opened or not.
+     */
+    get listOpened() {
+        return this._listOpened;
+    }
+    set listOpened(v) {
+        this._listOpened = v;
+        if (this._listOpened || this._highlight) {
+            this._highlight = false;
+        }
+        this.stateChanged.emit();
+    }
+    onNotificationChanged(manager, change) {
+        // Set private attribute to trigger only once the signal emission
+        this._count = this.manager.count;
+        const { autoClose } = change.notification.options;
+        const noToast = this.doNotDisturbMode ||
+            (typeof autoClose === 'number' && autoClose <= 0);
+        // Highlight if
+        //   the list is not opened (the style change if list is opened due to clickedItem style in statusbar.)
+        //   the change type is not removed
+        //   the notification will be hidden
+        if (!this._listOpened && change.type !== 'removed' && noToast) {
+            this._highlight = true;
+        }
+        this.stateChanged.emit();
+    }
+}
+/**
+ * Status view
+ */
+function NotificationStatus(props) {
+    return (React.createElement(GroupItem, { spacing: HALF_SPACING, onClick: () => {
+            props.onClick();
+        }, title: props.count > 0
+            ? props.trans._n('%1 notification', '%1 notifications', props.count)
+            : props.trans.__('No notifications') },
+        React.createElement(TextItem, { className: "jp-Notification-Status-Text", source: `${props.count}` }),
+        React.createElement(bellIcon.react, { top: '2px', stylesheet: 'statusBar' })));
+}
+/**
+ * Add notification center and toast
+ */
+export const notificationPlugin = {
+    id: '@jupyterlab/apputils-extension:notification',
+    autoStart: true,
+    requires: [IStatusBar],
+    optional: [ISettingRegistry, ITranslator],
+    activate: (app, statusBar, settingRegistry, translator) => {
+        Private.translator = translator !== null && translator !== void 0 ? translator : nullTranslator;
+        const trans = Private.translator.load('jupyterlab');
+        const model = new NotificationStatusModel(Notification.manager);
+        model.doNotDisturbMode = false;
+        if (settingRegistry) {
+            void Promise.all([
+                settingRegistry.load(notificationPlugin.id),
+                app.restored
+            ]).then(([plugin]) => {
+                const updateSettings = () => {
+                    model.doNotDisturbMode = plugin.get('doNotDisturbMode')
+                        .composite;
+                };
+                updateSettings();
+                plugin.changed.connect(updateSettings);
+            });
+        }
+        app.commands.addCommand(CommandIDs.notify, {
+            label: trans.__('Emit a notification'),
+            caption: trans.__('Notification is described by {message: string, type?: string, options?: {autoClose?: number | false, actions: {label: string, commandId: string, args?: ReadOnlyJSONObject, caption?: string, className?: string}[], data?: ReadOnlyJSONValue}}.'),
+            execute: args => {
+                var _a;
+                const { message, type } = args;
+                const options = (_a = args.options) !== null && _a !== void 0 ? _a : {};
+                return Notification.manager.notify(message, type !== null && type !== void 0 ? type : 'default', {
+                    ...options,
+                    actions: options.actions
+                        ? options.actions.map((action) => {
+                            return {
+                                ...action,
+                                callback: () => {
+                                    app.commands
+                                        .execute(action.commandId, action.args)
+                                        .catch(r => {
+                                        console.error(`Failed to executed '${action.commandId}':\n${r}`);
+                                    });
+                                }
+                            };
+                        })
+                        : null
+                });
+            }
+        });
+        app.commands.addCommand(CommandIDs.update, {
+            label: trans.__('Update a notification'),
+            caption: trans.__('Notification is described by {id: string, message: string, type?: string, options?: {autoClose?: number | false, actions: {label: string, commandId: string, args?: ReadOnlyJSONObject, caption?: string, className?: string}[], data?: ReadOnlyJSONValue}}.'),
+            execute: args => {
+                const { id, message, type, ...options } = args;
+                return Notification.manager.update({
+                    id,
+                    message,
+                    type: type !== null && type !== void 0 ? type : 'default',
+                    ...options,
+                    actions: options.actions
+                        ? options.actions.map((action) => {
+                            return {
+                                ...action,
+                                callback: () => {
+                                    app.commands
+                                        .execute(action.commandId, action.args)
+                                        .catch(r => {
+                                        console.error(`Failed to executed '${action.commandId}':\n${r}`);
+                                    });
+                                }
+                            };
+                        })
+                        : null
+                });
+            }
+        });
+        app.commands.addCommand(CommandIDs.dismiss, {
+            label: trans.__('Dismiss a notification'),
+            execute: args => {
+                const { id } = args;
+                Notification.manager.dismiss(id);
+            }
+        });
+        let popup = null;
+        model.listOpened = false;
+        const notificationList = ReactWidget.create(React.createElement(NotificationCenter, { manager: Notification.manager, onClose: () => {
+                popup === null || popup === void 0 ? void 0 : popup.dispose();
+            }, trans: trans }));
+        notificationList.addClass('jp-Notification-Center');
+        async function onNotification(manager, change) {
+            var _a;
+            if (model.doNotDisturbMode || (popup !== null && !popup.isDisposed)) {
+                return;
+            }
+            const { message, type, options, id } = change.notification;
+            if (typeof options.autoClose === 'number' && options.autoClose <= 0) {
+                // If the notification is silent, bail early.
+                return;
+            }
+            switch (change.type) {
+                case 'added':
+                    await Private.createToast(id, message, type, options);
+                    break;
+                case 'updated':
+                    {
+                        const toast = await Private.toast();
+                        const actions = options.actions;
+                        const autoClose = (_a = options.autoClose) !== null && _a !== void 0 ? _a : (actions && actions.length > 0 ? false : null);
+                        if (toast.isActive(id)) {
+                            // Update existing toast
+                            const closeToast = () => {
+                                // Dismiss the displayed toast
+                                toast.dismiss(id);
+                                // Dismiss the notification from the queue
+                                manager.dismiss(id);
+                            };
+                            toast.update(id, {
+                                type: type === 'in-progress' ? null : type,
+                                isLoading: type === 'in-progress',
+                                autoClose: autoClose,
+                                render: Private.createContent(message, closeToast, options.actions)
+                            });
+                        }
+                        else {
+                            // Needs to recreate a closed toast
+                            await Private.createToast(id, message, type, options);
+                        }
+                    }
+                    break;
+                case 'removed':
+                    await Private.toast().then(t => {
+                        t.dismiss(id);
+                    });
+                    break;
+            }
+        }
+        Notification.manager.changed.connect(onNotification);
+        const displayNotifications = () => {
+            if (popup) {
+                popup.dispose();
+                popup = null;
+            }
+            else {
+                popup = showPopup({
+                    body: notificationList,
+                    anchor: notificationStatus,
+                    align: 'right',
+                    hasDynamicSize: true,
+                    startHidden: true
+                });
+                // Dismiss all toasts when opening the notification center
+                Private.toast()
+                    .then(t => {
+                    t.dismiss();
+                })
+                    .catch(r => {
+                    console.error(`Failed to dismiss all toasts:\n${r}`);
+                })
+                    .finally(() => {
+                    popup === null || popup === void 0 ? void 0 : popup.launch();
+                    // Focus on the pop-up
+                    notificationList.node.focus();
+                    popup === null || popup === void 0 ? void 0 : popup.disposed.connect(() => {
+                        model.listOpened = false;
+                        popup = null;
+                    });
+                });
+            }
+            model.listOpened = popup !== null;
+        };
+        app.commands.addCommand(CommandIDs.display, {
+            label: trans.__('Show Notifications'),
+            execute: displayNotifications
+        });
+        const notificationStatus = ReactWidget.create(React.createElement(UseSignal, { signal: model.stateChanged }, () => {
+            if (model.highlight || (popup && !popup.isDisposed)) {
+                notificationStatus.addClass('jp-mod-selected');
+            }
+            else {
+                notificationStatus.removeClass('jp-mod-selected');
+            }
+            return (React.createElement(NotificationStatus, { count: model.count, highlight: model.highlight, trans: trans, onClick: displayNotifications }));
+        }));
+        notificationStatus.addClass('jp-Notification-Status');
+        statusBar.registerStatusItem(notificationPlugin.id, {
+            item: notificationStatus,
+            align: 'right',
+            rank: -1
+        });
+    }
+};
+var Private;
+(function (Private) {
+    /**
+     * Translator object for private namespace
+     */
+    Private.translator = nullTranslator;
+    /**
+     * Pointer to asynchronously loaded react-toastify
+     */
+    let toastify = null;
+    function CloseButton(props) {
+        const trans = Private.translator.load('jupyterlab');
+        return (React.createElement("button", { className: `jp-Button jp-mod-minimal ${TOAST_CLOSE_BUTTON_CLASS}`, title: trans.__('Hide notification'), onClick: props.closeToast },
+            React.createElement(closeIcon.react, { className: "jp-icon-hover", tag: "span" })));
+    }
+    let waitForToastify = null;
+    /**
+     * Asynchronously load the toast container
+     *
+     * @returns The toast object
+     */
+    async function toast() {
+        if (waitForToastify === null) {
+            waitForToastify = new PromiseDelegate();
+        }
+        else {
+            await waitForToastify.promise;
+        }
+        if (toastify === null) {
+            toastify = await import('react-toastify');
+            const container = document.body.appendChild(document.createElement('div'));
+            container.id = 'react-toastify-container';
+            const root = createRoot(container);
+            root.render(React.createElement(toastify.ToastContainer, { draggable: false, closeOnClick: false, hideProgressBar: true, newestOnTop: true, pauseOnFocusLoss: true, pauseOnHover: true, position: "bottom-right", className: "jp-toastContainer", transition: toastify.Slide, closeButton: CloseButton }));
+            waitForToastify.resolve();
+        }
+        return toastify.toast;
+    }
+    Private.toast = toast;
+    /**
+     * react-toastify icons loader
+     */
+    async function getIcons() {
+        if (toastify === null) {
+            await toast();
+        }
+        return toastify.Icons;
+    }
+    Private.getIcons = getIcons;
+    const displayType2Class = {
+        accent: 'jp-mod-accept',
+        link: 'jp-mod-link',
+        warn: 'jp-mod-warn',
+        default: ''
+    };
+    /**
+     * Create a button with customized callback in a toast
+     */
+    function ToastButton({ action, closeToast }) {
+        var _a, _b;
+        const clickHandler = (event) => {
+            action.callback(event);
+            if (!event.defaultPrevented) {
+                closeToast();
+            }
+        };
+        const classes = [
+            'jp-toast-button',
+            displayType2Class[(_a = action.displayType) !== null && _a !== void 0 ? _a : 'default']
+        ].join(' ');
+        return (React.createElement(Button, { title: (_b = action.caption) !== null && _b !== void 0 ? _b : action.label, className: classes, onClick: clickHandler, small: true }, action.label));
+    }
+    /**
+     * Helper function to construct the notification content
+     *
+     * @param message Message to print in the notification
+     * @param closeHandler Function closing the notification
+     * @param actions Toast actions
+     */
+    function createContent(message, closeHandler, actions) {
+        var _a;
+        const shortenMessage = message.length > MAX_MESSAGE_LENGTH
+            ? message.slice(0, MAX_MESSAGE_LENGTH) + '…'
+            : message;
+        return (React.createElement(React.Fragment, null,
+            React.createElement("div", null, shortenMessage.split('\n').map((part, index) => (React.createElement(React.Fragment, { key: `part-${index}` },
+                index > 0 ? React.createElement("br", null) : null,
+                part)))),
+            ((_a = actions === null || actions === void 0 ? void 0 : actions.length) !== null && _a !== void 0 ? _a : 0) > 0 && (React.createElement("div", { className: "jp-toast-buttonBar" },
+                React.createElement("div", { className: "jp-toast-spacer" }),
+                actions.map((action, idx) => {
+                    return (React.createElement(ToastButton, { key: 'button-' + idx, action: action, closeToast: closeHandler }));
+                })))));
+    }
+    Private.createContent = createContent;
+    /**
+     * Create a toast notification
+     *
+     * @param toastId Toast unique id
+     * @param message Toast message
+     * @param type Toast type
+     * @param options Toast options
+     * @returns Toast id
+     */
+    async function createToast(toastId, message, type, options = {}) {
+        const { actions, autoClose, data } = options;
+        const t = await toast();
+        const toastOptions = {
+            autoClose: autoClose !== null && autoClose !== void 0 ? autoClose : (actions && actions.length > 0 ? false : undefined),
+            data: data,
+            className: `jp-Notification-Toast-${type}`,
+            toastId,
+            type: type === 'in-progress' ? null : type,
+            isLoading: type === 'in-progress'
+        };
+        return t(({ closeToast }) => createContent(message, () => {
+            if (closeToast)
+                closeToast();
+            Notification.manager.dismiss(toastId);
+        }, actions), toastOptions);
+    }
+    Private.createToast = createToast;
+})(Private || (Private = {}));
+//# sourceMappingURL=notificationplugin.js.map

package/lib/notificationplugin.js.map

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

package/lib/palette.js

@@ -76,7 +76,7 @@ export class Palette {
         let modal = false;
         palette.node.setAttribute('role', 'region');
         palette.node.setAttribute('aria-label', trans.__('Command Palette Section'));
-        shell.add(palette, 'left', { rank: 300 });
+        shell.add(palette, 'left', { rank: 300, type: 'Command Palette' });
         if (settingRegistry) {
             const loadSettings = settingRegistry.load(PALETTE_PLUGIN_ID);
             const updateSettings = (settings) => {
@@ -84,7 +84,7 @@ export class Palette {
                 if (modal && !newModal) {
                     palette.parent = null;
                     modalPalette.detach();
-                    shell.add(palette, 'left', { rank: 300 });
+                    shell.add(palette, 'left', { rank: 300, type: 'Command Palette' });
                 }
                 else if (!modal && newModal) {
                     palette.parent = null;
@@ -109,7 +109,7 @@ export class Palette {
         const updatePaletteTitle = () => {
             const binding = find(app.commands.keyBindings, b => b.command === CommandIDs.activate);
             if (binding) {
-                const ks = CommandRegistry.formatKeystroke(binding.keys.join(' '));
+                const ks = binding.keys.map(CommandRegistry.formatKeystroke).join(', ');
                 palette.title.caption = trans.__('Commands (%1)', ks);
             }
             else {

package/lib/palette.js.map

@@ -1 +1 @@
-{"version":3,"file":"palette.js","sourceRoot":"","sources":["../src/palette.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"palette.js","sourceRoot":"","sources":["../src/palette.ts"],"names":[],"mappings":"AAAA;;;+EAG+E;AAG/E,OAAO,EAGL,mBAAmB,EACpB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAe,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAC3E,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAe,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD;;GAEG;AACH,IAAU,UAAU,CAEnB;AAFD,WAAU,UAAU;IACL,mBAAQ,GAAG,mCAAmC,CAAC;AAC9D,CAAC,EAFS,UAAU,KAAV,UAAU,QAEnB;AAED,MAAM,iBAAiB,GAAG,wCAAwC,CAAC;AAEnE;;;GAGG;AACH,MAAM,OAAO,OAAO;IAClB;;OAEG;IACH,YAAY,OAAuB,EAAE,UAAwB;QAC3D,IAAI,CAAC,UAAU,GAAG,UAAU,IAAI,cAAc,CAAC;QAC/C,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACjD,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,GAAG,EAAE,CAAC;QAC/B,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC;IAC5D,CAAC;IAED;;OAEG;IACH,IAAI,WAAW,CAAC,WAAmB;QACjC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,WAAW,GAAG,WAAW,CAAC;IACpD,CAAC;IACD,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,WAAW,CAAC;IAC7C,CAAC;IAED;;OAEG;IACH,QAAQ;QACN,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAED;;;;;;OAMG;IACH,OAAO,CAAC,OAAqB;QAC3B,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAsC,CAAC,CAAC;QAC3E,OAAO,IAAI,kBAAkB,CAAC,GAAG,EAAE;YACjC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC;CAIF;AAED;;GAEG;AACH,WAAiB,OAAO;IACtB;;OAEG;IACH,SAAgB,QAAQ,CACtB,GAAoB,EACpB,UAAuB,EACvB,eAAwC;QAExC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC;QAChC,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC5C,MAAM,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QACvD,MAAM,YAAY,GAAG,IAAI,mBAAmB,CAAC,EAAE,cAAc,EAAE,OAAO,EAAE,CAAC,CAAC;QAC1E,IAAI,KAAK,GAAG,KAAK,CAAC;QAElB,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC5C,OAAO,CAAC,IAAI,CAAC,YAAY,CACvB,YAAY,EACZ,KAAK,CAAC,EAAE,CAAC,yBAAyB,CAAC,CACpC,CAAC;QACF,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC,CAAC;QACnE,IAAI,eAAe,EAAE;YACnB,MAAM,YAAY,GAAG,eAAe,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YAC7D,MAAM,cAAc,GAAG,CAAC,QAAoC,EAAQ,EAAE;gBACpE,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,SAAoB,CAAC;gBAC5D,IAAI,KAAK,IAAI,CAAC,QAAQ,EAAE;oBACtB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;oBACtB,YAAY,CAAC,MAAM,EAAE,CAAC;oBACtB,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC,CAAC;iBACpE;qBAAM,IAAI,CAAC,KAAK,IAAI,QAAQ,EAAE;oBAC7B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;oBACtB,YAAY,CAAC,OAAO,GAAG,OAAO,CAAC;oBAC/B,OAAO,CAAC,IAAI,EAAE,CAAC;oBACf,YAAY,CAAC,MAAM,EAAE,CAAC;iBACvB;gBACD,KAAK,GAAG,QAAQ,CAAC;YACnB,CAAC,CAAC;YAEF,OAAO,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC;iBACtC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE;gBACnB,cAAc,CAAC,QAAQ,CAAC,CAAC;gBACzB,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;oBAClC,cAAc,CAAC,QAAQ,CAAC,CAAC;gBAC3B,CAAC,CAAC,CAAC;YACL,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,MAAa,EAAE,EAAE;gBACvB,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAChC,CAAC,CAAC,CAAC;SACN;QAED,kDAAkD;QAClD,MAAM,kBAAkB,GAAG,GAAG,EAAE;YAC9B,MAAM,OAAO,GAAG,IAAI,CAClB,GAAG,CAAC,QAAQ,CAAC,WAAW,EACxB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,UAAU,CAAC,QAAQ,CACvC,CAAC;YACF,IAAI,OAAO,EAAE;gBACX,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACxE,OAAO,CAAC,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC,EAAE,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;aACvD;iBAAM;gBACL,OAAO,CAAC,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC;aAC9C;QACH,CAAC,CAAC;QACF,kBAAkB,EAAE,CAAC;QACrB,GAAG,CAAC,QAAQ,CAAC,iBAAiB,CAAC,OAAO,CAAC,GAAG,EAAE;YAC1C,kBAAkB,EAAE,CAAC;QACvB,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,QAAQ,EAAE;YACvC,OAAO,EAAE,GAAG,EAAE;gBACZ,IAAI,KAAK,EAAE;oBACT,YAAY,CAAC,QAAQ,EAAE,CAAC;iBACzB;qBAAM;oBACL,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;iBAChC;YACH,CAAC;YACD,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,0BAA0B,CAAC;SAC5C,CAAC,CAAC;QAEH,OAAO,CAAC,SAAS,CAAC,WAAW,GAAG,KAAK,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;QAEnD,OAAO,IAAI,OAAO,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAC1C,CAAC;IA9Ee,gBAAQ,WA8EvB,CAAA;IAED;;OAEG;IACH,SAAgB,OAAO,CACrB,GAAoB,EACpB,QAAyB,EACzB,UAAuB;QAEvB,MAAM,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QACvD,4EAA4E;QAC5E,8EAA8E;QAC9E,WAAW;QACX,QAAQ,CAAC,GAAG,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;IAC3C,CAAC;IAVe,eAAO,UAUtB,CAAA;AACH,CAAC,EAlGgB,OAAO,KAAP,OAAO,QAkGvB;AAED;;GAEG;AACH,IAAU,OAAO,CA2BhB;AA3BD,WAAU,OAAO;IACf;;OAEG;IACH,IAAI,OAAuB,CAAC;IAE5B;;OAEG;IACH,SAAgB,aAAa,CAC3B,GAAoB,EACpB,UAAuB;QAEvB,IAAI,CAAC,OAAO,EAAE;YACZ,iDAAiD;YACjD,OAAO,GAAG,IAAI,cAAc,CAAC;gBAC3B,QAAQ,EAAE,GAAG,CAAC,QAAQ;gBACtB,QAAQ,EAAE,iBAAiB,CAAC,eAAe;aAC5C,CAAC,CAAC;YACH,OAAO,CAAC,EAAE,GAAG,iBAAiB,CAAC;YAC/B,OAAO,CAAC,KAAK,CAAC,IAAI,GAAG,WAAW,CAAC;YACjC,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAC5C,OAAO,CAAC,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC;SAC5C;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAjBe,qBAAa,gBAiB5B,CAAA;AACH,CAAC,EA3BS,OAAO,KAAP,OAAO,QA2BhB"}

package/lib/settingconnector.js

@@ -1,3 +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';

package/lib/settingconnector.js.map

@@ -1 +1 @@
-{"version":3,"file":"settingconnector.js","sourceRoot":"","sources":["../src/settingconnector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAkB,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C;;;;;GAKG;AACH,MAAM,OAAO,gBAAiB,SAAQ,aAGrC;IACC,YAAY,SAA2D;QACrE,KAAK,EAAE,CAAC;QAwCF,gBAAW,GAAiC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAvCtE,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAC9B,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,EAAU;QACd,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,IAAI,CAAC,CAAC,EAAE,IAAI,UAAU,CAAC,EAAE;YACvB,UAAU,CAAC,EAAE,CAAC,GAAG,IAAI,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;SACtE;QACD,OAAO,UAAU,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,IAAI,CACR,QAA0B,KAAK;QAE/B,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,UAAU,CAAC,SAAS,CAAC;QACxD,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QAErD,IAAI,KAAK,KAAK,KAAK,EAAE;YACnB,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;SACxB;QAED,OAAO;YACL,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YACzD,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;SACtE,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,EAAU,EAAE,GAAW;QAChC,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IACtC,CAAC;CAIF"}
+{"version":3,"file":"settingconnector.js","sourceRoot":"","sources":["../src/settingconnector.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAkB,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C;;;;;GAKG;AACH,MAAM,OAAO,gBAAiB,SAAQ,aAGrC;IACC,YAAY,SAA2D;QACrE,KAAK,EAAE,CAAC;QAwCF,gBAAW,GAAiC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAvCtE,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAC9B,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,EAAU;QACd,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,IAAI,CAAC,CAAC,EAAE,IAAI,UAAU,CAAC,EAAE;YACvB,UAAU,CAAC,EAAE,CAAC,GAAG,IAAI,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;SACtE;QACD,OAAO,UAAU,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,IAAI,CACR,QAA0B,KAAK;QAE/B,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,UAAU,CAAC,SAAS,CAAC;QACxD,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QAErD,IAAI,KAAK,KAAK,KAAK,EAAE;YACnB,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;SACxB;QAED,OAAO;YACL,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YACzD,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;SACtE,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,EAAU,EAAE,GAAW;QAChC,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IACtC,CAAC;CAIF"}

package/lib/statusbarplugin.js

@@ -3,27 +3,28 @@
 | Distributed under the terms of the Modified BSD License.
 |----------------------------------------------------------------------------*/
 import { ILabShell } from '@jupyterlab/application';
-import { IKernelStatusModel, ISessionContextDialogs, KernelStatus, RunningSessions, sessionContextDialogs } from '@jupyterlab/apputils';
+import { IKernelStatusModel, ISessionContextDialogs, KernelStatus, RunningSessions, SessionContextDialogs } from '@jupyterlab/apputils';
 import { IStatusBar } from '@jupyterlab/statusbar';
-import { ITranslator } from '@jupyterlab/translation';
-import { toArray } from '@lumino/algorithm';
+import { ITranslator, nullTranslator } from '@jupyterlab/translation';
 /**
  * A plugin that provides a kernel status item to the status bar.
  */
 export const kernelStatus = {
     id: '@jupyterlab/apputils-extension:kernel-status',
     autoStart: true,
-    requires: [IStatusBar, ITranslator],
+    requires: [IStatusBar],
     provides: IKernelStatusModel,
-    optional: [ISessionContextDialogs, ILabShell],
-    activate: (app, statusBar, translator, sessionDialogs, labShell) => {
+    optional: [ISessionContextDialogs, ITranslator, ILabShell],
+    activate: (app, statusBar, sessionDialogs_, translator_, labShell) => {
+        const translator = translator_ !== null && translator_ !== void 0 ? translator_ : nullTranslator;
+        const sessionDialogs = sessionDialogs_ !== null && sessionDialogs_ !== void 0 ? sessionDialogs_ : new SessionContextDialogs({ translator });
         // When the status item is clicked, launch the kernel
         // selection dialog for the current session.
         const changeKernel = async () => {
             if (!item.model.sessionContext) {
                 return;
             }
-            await (sessionDialogs !== null && sessionDialogs !== void 0 ? sessionDialogs : sessionContextDialogs).selectKernel(item.model.sessionContext, translator);
+            await sessionDialogs.selectKernel(item.model.sessionContext);
         };
         // Create the status item.
         const item = new KernelStatus({ onClick: changeKernel }, translator);
@@ -85,8 +86,8 @@ export const runningSessionsStatus = {
             serviceManager: app.serviceManager,
             translator
         });
-        item.model.sessions = toArray(app.serviceManager.sessions.running()).length;
-        item.model.terminals = toArray(app.serviceManager.terminals.running()).length;
+        item.model.sessions = Array.from(app.serviceManager.sessions.running()).length;
+        item.model.terminals = Array.from(app.serviceManager.terminals.running()).length;
         statusBar.registerStatusItem(runningSessionsStatus.id, {
             item,
             align: 'left',