@jupyterlab/apputils-extension 4.2.0-alpha.1 → 4.2.0-alpha.2

package/lib/workspacesplugin.d.ts

@@ -1,5 +1,5 @@
 import { JupyterFrontEndPlugin } from '@jupyterlab/application';
 /**
- * The workspace MIME renderer and save plugin.
+ * The workspace MIME renderer.
  */
 export declare const workspacesPlugin: JupyterFrontEndPlugin<void>;

package/lib/workspacesplugin.js

@@ -1,127 +1,47 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
-import { IRouter, JupyterFrontEnd } from '@jupyterlab/application';
-import { Dialog, IWindowResolver, showDialog } from '@jupyterlab/apputils';
-import { URLExt } from '@jupyterlab/coreutils';
 import { ABCWidgetFactory, DocumentWidget } from '@jupyterlab/docregistry';
-import { IDefaultFileBrowser } from '@jupyterlab/filebrowser';
 import { IStateDB } from '@jupyterlab/statedb';
+import { IWorkspaceCommands } from '@jupyterlab/workspaces';
 import { ITranslator, nullTranslator } from '@jupyterlab/translation';
 import { Widget } from '@lumino/widgets';
-var CommandIDs;
-(function (CommandIDs) {
-    CommandIDs.saveWorkspace = 'workspace-ui:save';
-    CommandIDs.saveWorkspaceAs = 'workspace-ui:save-as';
-})(CommandIDs || (CommandIDs = {}));
 const WORKSPACE_NAME = 'jupyterlab-workspace';
 const WORKSPACE_EXT = '.' + WORKSPACE_NAME;
 const LAST_SAVE_ID = 'workspace-ui:lastSave';
 const ICON_NAME = 'jp-JupyterIcon';
 /**
- * The workspace MIME renderer and save plugin.
+ * The workspace MIME renderer.
  */
 export const workspacesPlugin = {
     id: '@jupyterlab/apputils-extension:workspaces',
-    description: 'Add workspace file type and commands.',
+    description: 'Add workspace file type.',
     autoStart: true,
-    requires: [
-        IDefaultFileBrowser,
-        IWindowResolver,
-        IStateDB,
-        ITranslator,
-        JupyterFrontEnd.IPaths
-    ],
-    optional: [IRouter],
-    activate: (app, fileBrowser, resolver, state, translator, paths, router) => {
+    requires: [IStateDB, IWorkspaceCommands, ITranslator],
+    activate: (app, state, commands, translator) => {
         // The workspace factory creates dummy widgets to load a new workspace.
         const factory = new Private.WorkspaceFactory({
             workspaces: app.serviceManager.workspaces,
-            router,
             state,
             translator,
-            paths
+            open: async (id) => {
+                await app.commands.execute(commands.open, { workspace: id });
+            }
         });
         const trans = translator.load('jupyterlab');
         app.docRegistry.addFileType({
             name: WORKSPACE_NAME,
             contentType: 'file',
             fileFormat: 'text',
-            displayName: trans.__('JupyterLab workspace File'),
+            displayName: trans.__('JupyterLab Workspace File'),
             extensions: [WORKSPACE_EXT],
             mimeTypes: ['text/json'],
             iconClass: ICON_NAME
         });
         app.docRegistry.addWidgetFactory(factory);
-        app.commands.addCommand(CommandIDs.saveWorkspaceAs, {
-            label: trans.__('Save Current Workspace As…'),
-            execute: async () => {
-                const data = app.serviceManager.workspaces.fetch(resolver.name);
-                await Private.saveAs(fileBrowser, app.serviceManager.contents, data, state, translator);
-            }
-        });
-        app.commands.addCommand(CommandIDs.saveWorkspace, {
-            label: trans.__('Save Current Workspace'),
-            execute: async () => {
-                const { contents } = app.serviceManager;
-                const data = app.serviceManager.workspaces.fetch(resolver.name);
-                const lastSave = (await state.fetch(LAST_SAVE_ID));
-                if (lastSave === undefined) {
-                    await Private.saveAs(fileBrowser, contents, data, state, translator);
-                }
-                else {
-                    await Private.save(lastSave, contents, data, state);
-                }
-            }
-        });
     }
 };
 var Private;
 (function (Private) {
-    /**
-     * Save workspace to a user provided location
-     */
-    async function save(userPath, contents, data, state) {
-        let name = userPath.split('/').pop();
-        // Add extension if not provided or remove extension from name if it was.
-        if (name !== undefined && name.includes('.')) {
-            name = name.split('.')[0];
-        }
-        else {
-            userPath = userPath + WORKSPACE_EXT;
-        }
-        // Save last save location, for save button to work
-        await state.save(LAST_SAVE_ID, userPath);
-        const resolvedData = await data;
-        resolvedData.metadata.id = `${name}`;
-        await contents.save(userPath, {
-            type: 'file',
-            format: 'text',
-            content: JSON.stringify(resolvedData)
-        });
-    }
-    Private.save = save;
-    /**
-     * Ask user for location, and save workspace.
-     * Default location is the current directory in the file browser
-     */
-    async function saveAs(browser, contents, data, state, translator) {
-        var _a;
-        translator = translator || nullTranslator;
-        const lastSave = await state.fetch(LAST_SAVE_ID);
-        let defaultName;
-        if (lastSave === undefined) {
-            defaultName = 'new-workspace';
-        }
-        else {
-            defaultName = (_a = lastSave.split('/').pop()) === null || _a === void 0 ? void 0 : _a.split('.')[0];
-        }
-        const defaultPath = browser.model.path + '/' + defaultName + WORKSPACE_EXT;
-        const userPath = await getSavePath(defaultPath, translator);
-        if (userPath) {
-            await save(userPath, contents, data, state);
-        }
-    }
-    Private.saveAs = saveAs;
     /**
      * This widget factory is used to handle double click on workspace
      */
@@ -140,14 +60,13 @@ var Private;
                 defaultFor: [WORKSPACE_NAME],
                 readOnly: true
             });
-            this._application = options.paths.urls.app;
-            this._router = options.router;
             this._state = options.state;
             this._workspaces = options.workspaces;
+            this._open = options.open;
         }
         /**
          * Loads the workspace into load, and jump to it
-         * @param context This is used queried to query the workspace content
+         * @param context This is used to query the workspace content
          */
         createNewWidget(context) {
             // Save a file's contents as a workspace and navigate to that workspace.
@@ -161,17 +80,7 @@ var Private;
                 // Save last save location for the save command.
                 await this._state.save(LAST_SAVE_ID, path);
                 // Navigate to new workspace.
-                const workspacesBase = URLExt.join(this._application, 'workspaces');
-                const url = URLExt.join(workspacesBase, id);
-                if (!url.startsWith(workspacesBase)) {
-                    throw new Error('Can only be used for workspaces');
-                }
-                if (this._router) {
-                    this._router.navigate(url, { hard: true });
-                }
-                else {
-                    document.location.href = url;
-                }
+                await this._open(id);
             });
             return dummyWidget(context);
         }
@@ -187,54 +96,5 @@ var Private;
         widget.content.dispose();
         return widget;
     }
-    /**
-     * Ask user for a path to save to.
-     * @param defaultPath Path already present when the dialog is shown
-     */
-    async function getSavePath(defaultPath, translator) {
-        translator = translator || nullTranslator;
-        const trans = translator.load('jupyterlab');
-        const saveBtn = Dialog.okButton({
-            label: trans.__('Save'),
-            ariaLabel: trans.__('Save Current Workspace')
-        });
-        const result = await showDialog({
-            title: trans.__('Save Current Workspace As…'),
-            body: new SaveWidget(defaultPath),
-            buttons: [Dialog.cancelButton(), saveBtn]
-        });
-        if (result.button.label === trans.__('Save')) {
-            return result.value;
-        }
-        else {
-            return null;
-        }
-    }
-    /**
-     * A widget that gets a file path from a user.
-     */
-    class SaveWidget extends Widget {
-        /**
-         * Gets a modal node for getting save location. Will have a default to the current opened directory
-         * @param path Default location
-         */
-        constructor(path) {
-            super({ node: createSaveNode(path) });
-        }
-        /**
-         * Gets the save path entered by the user
-         */
-        getValue() {
-            return this.node.value;
-        }
-    }
-    /**
-     * Create the node for a save widget.
-     */
-    function createSaveNode(path) {
-        const input = document.createElement('input');
-        input.value = path;
-        return input;
-    }
 })(Private || (Private = {}));
 //# sourceMappingURL=workspacesplugin.js.map

package/lib/workspacesplugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspacesplugin.js","sourceRoot":"","sources":["../src/workspacesplugin.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAE3D,OAAO,EACL,OAAO,EACP,eAAe,EAEhB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EACL,gBAAgB,EAEhB,cAAc,EAEf,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAE9D,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,IAAU,UAAU,CAInB;AAJD,WAAU,UAAU;IACL,wBAAa,GAAG,mBAAmB,CAAC;IAEpC,0BAAe,GAAG,sBAAsB,CAAC;AACxD,CAAC,EAJS,UAAU,KAAV,UAAU,QAInB;AAED,MAAM,cAAc,GAAG,sBAAsB,CAAC;AAC9C,MAAM,aAAa,GAAG,GAAG,GAAG,cAAc,CAAC;AAC3C,MAAM,YAAY,GAAG,uBAAuB,CAAC;AAC7C,MAAM,SAAS,GAAG,gBAAgB,CAAC;AAEnC;;GAEG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAgC;IAC3D,EAAE,EAAE,2CAA2C;IAC/C,WAAW,EAAE,uCAAuC;IACpD,SAAS,EAAE,IAAI;IACf,QAAQ,EAAE;QACR,mBAAmB;QACnB,eAAe;QACf,QAAQ;QACR,WAAW;QACX,eAAe,CAAC,MAAM;KACvB;IACD,QAAQ,EAAE,CAAC,OAAO,CAAC;IACnB,QAAQ,EAAE,CACR,GAAoB,EACpB,WAAgC,EAChC,QAAyB,EACzB,KAAe,EACf,UAAuB,EACvB,KAA6B,EAC7B,MAAsB,EAChB,EAAE;QACR,uEAAuE;QACvE,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,gBAAgB,CAAC;YAC3C,UAAU,EAAE,GAAG,CAAC,cAAc,CAAC,UAAU;YACzC,MAAM;YACN,KAAK;YACL,UAAU;YACV,KAAK;SACN,CAAC,CAAC;QACH,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAE5C,GAAG,CAAC,WAAW,CAAC,WAAW,CAAC;YAC1B,IAAI,EAAE,cAAc;YACpB,WAAW,EAAE,MAAM;YACnB,UAAU,EAAE,MAAM;YAClB,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,2BAA2B,CAAC;YAClD,UAAU,EAAE,CAAC,aAAa,CAAC;YAC3B,SAAS,EAAE,CAAC,WAAW,CAAC;YACxB,SAAS,EAAE,SAAS;SACrB,CAAC,CAAC;QACH,GAAG,CAAC,WAAW,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAC1C,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,eAAe,EAAE;YAClD,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,4BAA4B,CAAC;YAC7C,OAAO,EAAE,KAAK,IAAI,EAAE;gBAClB,MAAM,IAAI,GAAG,GAAG,CAAC,cAAc,CAAC,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBAChE,MAAM,OAAO,CAAC,MAAM,CAClB,WAAW,EACX,GAAG,CAAC,cAAc,CAAC,QAAQ,EAC3B,IAAI,EACJ,KAAK,EACL,UAAU,CACX,CAAC;YACJ,CAAC;SACF,CAAC,CAAC;QAEH,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,aAAa,EAAE;YAChD,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,wBAAwB,CAAC;YACzC,OAAO,EAAE,KAAK,IAAI,EAAE;gBAClB,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC,cAAc,CAAC;gBACxC,MAAM,IAAI,GAAG,GAAG,CAAC,cAAc,CAAC,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBAChE,MAAM,QAAQ,GAAG,CAAC,MAAM,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,CAAW,CAAC;gBAC7D,IAAI,QAAQ,KAAK,SAAS,EAAE;oBAC1B,MAAM,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;iBACtE;qBAAM;oBACL,MAAM,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;iBACrD;YACH,CAAC;SACF,CAAC,CAAC;IACL,CAAC;CACF,CAAC;AAEF,IAAU,OAAO,CA8MhB;AA9MD,WAAU,OAAO;IACf;;OAEG;IACI,KAAK,UAAU,IAAI,CACxB,QAAgB,EAChB,QAA2B,EAC3B,IAAmC,EACnC,KAAe;QAEf,IAAI,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QAErC,yEAAyE;QACzE,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YAC5C,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;SAC3B;aAAM;YACL,QAAQ,GAAG,QAAQ,GAAG,aAAa,CAAC;SACrC;QAED,mDAAmD;QACnD,MAAM,KAAK,CAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QAEzC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC;QAChC,YAAY,CAAC,QAAQ,CAAC,EAAE,GAAG,GAAG,IAAI,EAAE,CAAC;QACrC,MAAM,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE;YAC5B,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC;SACtC,CAAC,CAAC;IACL,CAAC;IAzBqB,YAAI,OAyBzB,CAAA;IAED;;;OAGG;IACI,KAAK,UAAU,MAAM,CAC1B,OAA4B,EAC5B,QAA2B,EAC3B,IAAmC,EACnC,KAAe,EACf,UAAwB;;QAExB,UAAU,GAAG,UAAU,IAAI,cAAc,CAAC;QAC1C,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAEjD,IAAI,WAAW,CAAC;QAChB,IAAI,QAAQ,KAAK,SAAS,EAAE;YAC1B,WAAW,GAAG,eAAe,CAAC;SAC/B;aAAM;YACL,WAAW,GAAG,MAAC,QAAmB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,0CAAE,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;SACpE;QAED,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,GAAG,GAAG,GAAG,WAAW,GAAG,aAAa,CAAC;QAC3E,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QAE5D,IAAI,QAAQ,EAAE;YACZ,MAAM,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;SAC7C;IACH,CAAC;IAvBqB,cAAM,SAuB3B,CAAA;IAED;;OAEG;IACH,MAAa,gBAAiB,SAAQ,gBAAiC;QACrE;;;;WAIG;QACH,YAAY,OAAkC;YAC5C,MAAM,KAAK,GAAG,CAAC,OAAO,CAAC,UAAU,IAAI,cAAc,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACxE,KAAK,CAAC;gBACJ,IAAI,EAAE,kBAAkB;gBACxB,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAAC;gBACnC,SAAS,EAAE,CAAC,cAAc,CAAC;gBAC3B,UAAU,EAAE,CAAC,cAAc,CAAC;gBAC5B,QAAQ,EAAE,IAAI;aACf,CAAC,CAAC;YACH,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;YAC3C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;YAC9B,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;YAC5B,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;QACxC,CAAC;QAED;;;WAGG;QACO,eAAe,CACvB,OAAiC;YAEjC,wEAAwE;YACxE,KAAK,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;gBACjC,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC;gBAC3B,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,EAAqC,CAAC;gBACnE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;gBAC1B,MAAM,EAAE,GAAG,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAEjC,yCAAyC;gBACzC,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;gBAE3C,gDAAgD;gBAChD,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;gBAE3C,6BAA6B;gBAC7B,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;gBACpE,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;gBAC5C,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE;oBACnC,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;iBACpD;gBACD,IAAI,IAAI,CAAC,OAAO,EAAE;oBAChB,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;iBAC5C;qBAAM;oBACL,QAAQ,CAAC,QAAQ,CAAC,IAAI,GAAG,GAAG,CAAC;iBAC9B;YACH,CAAC,CAAC,CAAC;YACH,OAAO,WAAW,CAAC,OAAO,CAAC,CAAC;QAC9B,CAAC;KAMF;IA5DY,wBAAgB,mBA4D5B,CAAA;IAkBD;;;;OAIG;IACH,SAAS,WAAW,CAAC,OAAiC;QACpD,MAAM,MAAM,GAAG,IAAI,cAAc,CAAC,EAAE,OAAO,EAAE,IAAI,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;QACtE,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QACzB,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;OAGG;IACH,KAAK,UAAU,WAAW,CACxB,WAAmB,EACnB,UAAwB;QAExB,UAAU,GAAG,UAAU,IAAI,cAAc,CAAC;QAC1C,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC5C,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC;YAC9B,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC;YACvB,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,wBAAwB,CAAC;SAC9C,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC;YAC9B,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,4BAA4B,CAAC;YAC7C,IAAI,EAAE,IAAI,UAAU,CAAC,WAAW,CAAC;YACjC,OAAO,EAAE,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,OAAO,CAAC;SAC1C,CAAC,CAAC;QACH,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,KAAK,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE;YAC5C,OAAO,MAAM,CAAC,KAAK,CAAC;SACrB;aAAM;YACL,OAAO,IAAI,CAAC;SACb;IACH,CAAC;IAED;;OAEG;IACH,MAAM,UAAW,SAAQ,MAAM;QAC7B;;;WAGG;QACH,YAAY,IAAY;YACtB,KAAK,CAAC,EAAE,IAAI,EAAE,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACxC,CAAC;QAED;;WAEG;QACH,QAAQ;YACN,OAAQ,IAAI,CAAC,IAAyB,CAAC,KAAK,CAAC;QAC/C,CAAC;KACF;IAED;;OAEG;IACH,SAAS,cAAc,CAAC,IAAY;QAClC,MAAM,KAAK,GAAG,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAC9C,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC;QACnB,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC,EA9MS,OAAO,KAAP,OAAO,QA8MhB"}
+{"version":3,"file":"workspacesplugin.js","sourceRoot":"","sources":["../src/workspacesplugin.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyterlab/apputils-extension",
-  "version": "4.2.0-alpha.1",
+  "version": "4.2.0-alpha.2",
   "description": "JupyterLab - Application Utilities Extension",
   "homepage": "https://github.com/jupyterlab/jupyterlab",
   "bugs": {
@@ -38,19 +38,19 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@jupyterlab/application": "^4.2.0-alpha.1",
-    "@jupyterlab/apputils": "^4.3.0-alpha.1",
-    "@jupyterlab/coreutils": "^6.2.0-alpha.1",
-    "@jupyterlab/docregistry": "^4.2.0-alpha.1",
-    "@jupyterlab/filebrowser": "^4.2.0-alpha.1",
-    "@jupyterlab/mainmenu": "^4.2.0-alpha.1",
-    "@jupyterlab/rendermime-interfaces": "^3.10.0-alpha.1",
-    "@jupyterlab/services": "^7.2.0-alpha.1",
-    "@jupyterlab/settingregistry": "^4.2.0-alpha.1",
-    "@jupyterlab/statedb": "^4.2.0-alpha.1",
-    "@jupyterlab/statusbar": "^4.2.0-alpha.1",
-    "@jupyterlab/translation": "^4.2.0-alpha.1",
-    "@jupyterlab/ui-components": "^4.2.0-alpha.1",
+    "@jupyterlab/application": "^4.2.0-alpha.2",
+    "@jupyterlab/apputils": "^4.3.0-alpha.2",
+    "@jupyterlab/coreutils": "^6.2.0-alpha.2",
+    "@jupyterlab/docregistry": "^4.2.0-alpha.2",
+    "@jupyterlab/mainmenu": "^4.2.0-alpha.2",
+    "@jupyterlab/rendermime-interfaces": "^3.10.0-alpha.2",
+    "@jupyterlab/services": "^7.2.0-alpha.2",
+    "@jupyterlab/settingregistry": "^4.2.0-alpha.2",
+    "@jupyterlab/statedb": "^4.2.0-alpha.2",
+    "@jupyterlab/statusbar": "^4.2.0-alpha.2",
+    "@jupyterlab/translation": "^4.2.0-alpha.2",
+    "@jupyterlab/ui-components": "^4.2.0-alpha.2",
+    "@jupyterlab/workspaces": "^4.2.0-alpha.2",
     "@lumino/algorithm": "^2.0.1",
     "@lumino/commands": "^2.2.0",
     "@lumino/coreutils": "^2.1.2",

package/src/workspacesplugin.ts

@@ -2,66 +2,48 @@
 // Distributed under the terms of the Modified BSD License.
 
 import {
-  IRouter,
   JupyterFrontEnd,
   JupyterFrontEndPlugin
 } from '@jupyterlab/application';
-import { Dialog, IWindowResolver, showDialog } from '@jupyterlab/apputils';
-import { URLExt } from '@jupyterlab/coreutils';
 import {
   ABCWidgetFactory,
   DocumentRegistry,
   DocumentWidget,
   IDocumentWidget
 } from '@jupyterlab/docregistry';
-import { IDefaultFileBrowser } from '@jupyterlab/filebrowser';
-import { Contents, Workspace, WorkspaceManager } from '@jupyterlab/services';
+import { Workspace, WorkspaceManager } from '@jupyterlab/services';
 import { IStateDB } from '@jupyterlab/statedb';
+import { IWorkspaceCommands } from '@jupyterlab/workspaces';
 import { ITranslator, nullTranslator } from '@jupyterlab/translation';
 import { Widget } from '@lumino/widgets';
 
-namespace CommandIDs {
-  export const saveWorkspace = 'workspace-ui:save';
-
-  export const saveWorkspaceAs = 'workspace-ui:save-as';
-}
-
 const WORKSPACE_NAME = 'jupyterlab-workspace';
 const WORKSPACE_EXT = '.' + WORKSPACE_NAME;
 const LAST_SAVE_ID = 'workspace-ui:lastSave';
 const ICON_NAME = 'jp-JupyterIcon';
 
 /**
- * The workspace MIME renderer and save plugin.
+ * The workspace MIME renderer.
  */
 export const workspacesPlugin: JupyterFrontEndPlugin<void> = {
   id: '@jupyterlab/apputils-extension:workspaces',
-  description: 'Add workspace file type and commands.',
+  description: 'Add workspace file type.',
   autoStart: true,
-  requires: [
-    IDefaultFileBrowser,
-    IWindowResolver,
-    IStateDB,
-    ITranslator,
-    JupyterFrontEnd.IPaths
-  ],
-  optional: [IRouter],
+  requires: [IStateDB, IWorkspaceCommands, ITranslator],
   activate: (
     app: JupyterFrontEnd,
-    fileBrowser: IDefaultFileBrowser,
-    resolver: IWindowResolver,
     state: IStateDB,
-    translator: ITranslator,
-    paths: JupyterFrontEnd.IPaths,
-    router: IRouter | null
+    commands: IWorkspaceCommands,
+    translator: ITranslator
   ): void => {
     // The workspace factory creates dummy widgets to load a new workspace.
     const factory = new Private.WorkspaceFactory({
       workspaces: app.serviceManager.workspaces,
-      router,
       state,
       translator,
-      paths
+      open: async (id: string) => {
+        await app.commands.execute(commands.open, { workspace: id });
+      }
     });
     const trans = translator.load('jupyterlab');
 
@@ -69,102 +51,16 @@ export const workspacesPlugin: JupyterFrontEndPlugin<void> = {
       name: WORKSPACE_NAME,
       contentType: 'file',
       fileFormat: 'text',
-      displayName: trans.__('JupyterLab workspace File'),
+      displayName: trans.__('JupyterLab Workspace File'),
       extensions: [WORKSPACE_EXT],
       mimeTypes: ['text/json'],
       iconClass: ICON_NAME
     });
     app.docRegistry.addWidgetFactory(factory);
-    app.commands.addCommand(CommandIDs.saveWorkspaceAs, {
-      label: trans.__('Save Current Workspace As…'),
-      execute: async () => {
-        const data = app.serviceManager.workspaces.fetch(resolver.name);
-        await Private.saveAs(
-          fileBrowser,
-          app.serviceManager.contents,
-          data,
-          state,
-          translator
-        );
-      }
-    });
-
-    app.commands.addCommand(CommandIDs.saveWorkspace, {
-      label: trans.__('Save Current Workspace'),
-      execute: async () => {
-        const { contents } = app.serviceManager;
-        const data = app.serviceManager.workspaces.fetch(resolver.name);
-        const lastSave = (await state.fetch(LAST_SAVE_ID)) as string;
-        if (lastSave === undefined) {
-          await Private.saveAs(fileBrowser, contents, data, state, translator);
-        } else {
-          await Private.save(lastSave, contents, data, state);
-        }
-      }
-    });
   }
 };
 
 namespace Private {
-  /**
-   * Save workspace to a user provided location
-   */
-  export async function save(
-    userPath: string,
-    contents: Contents.IManager,
-    data: Promise<Workspace.IWorkspace>,
-    state: IStateDB
-  ): Promise<void> {
-    let name = userPath.split('/').pop();
-
-    // Add extension if not provided or remove extension from name if it was.
-    if (name !== undefined && name.includes('.')) {
-      name = name.split('.')[0];
-    } else {
-      userPath = userPath + WORKSPACE_EXT;
-    }
-
-    // Save last save location, for save button to work
-    await state.save(LAST_SAVE_ID, userPath);
-
-    const resolvedData = await data;
-    resolvedData.metadata.id = `${name}`;
-    await contents.save(userPath, {
-      type: 'file',
-      format: 'text',
-      content: JSON.stringify(resolvedData)
-    });
-  }
-
-  /**
-   * Ask user for location, and save workspace.
-   * Default location is the current directory in the file browser
-   */
-  export async function saveAs(
-    browser: IDefaultFileBrowser,
-    contents: Contents.IManager,
-    data: Promise<Workspace.IWorkspace>,
-    state: IStateDB,
-    translator?: ITranslator
-  ): Promise<void> {
-    translator = translator || nullTranslator;
-    const lastSave = await state.fetch(LAST_SAVE_ID);
-
-    let defaultName;
-    if (lastSave === undefined) {
-      defaultName = 'new-workspace';
-    } else {
-      defaultName = (lastSave as string).split('/').pop()?.split('.')[0];
-    }
-
-    const defaultPath = browser.model.path + '/' + defaultName + WORKSPACE_EXT;
-    const userPath = await getSavePath(defaultPath, translator);
-
-    if (userPath) {
-      await save(userPath, contents, data, state);
-    }
-  }
-
   /**
    * This widget factory is used to handle double click on workspace
    */
@@ -183,15 +79,14 @@ namespace Private {
         defaultFor: [WORKSPACE_NAME],
         readOnly: true
       });
-      this._application = options.paths.urls.app;
-      this._router = options.router;
       this._state = options.state;
       this._workspaces = options.workspaces;
+      this._open = options.open;
     }
 
     /**
      * Loads the workspace into load, and jump to it
-     * @param context This is used queried to query the workspace content
+     * @param context This is used to query the workspace content
      */
     protected createNewWidget(
       context: DocumentRegistry.Context
@@ -201,6 +96,7 @@ namespace Private {
         const file = context.model;
         const workspace = file.toJSON() as unknown as Workspace.IWorkspace;
         const path = context.path;
+
         const id = workspace.metadata.id;
 
         // Save the file contents as a workspace.
@@ -210,22 +106,12 @@ namespace Private {
         await this._state.save(LAST_SAVE_ID, path);
 
         // Navigate to new workspace.
-        const workspacesBase = URLExt.join(this._application, 'workspaces');
-        const url = URLExt.join(workspacesBase, id);
-        if (!url.startsWith(workspacesBase)) {
-          throw new Error('Can only be used for workspaces');
-        }
-        if (this._router) {
-          this._router.navigate(url, { hard: true });
-        } else {
-          document.location.href = url;
-        }
+        await this._open(id);
       });
       return dummyWidget(context);
     }
 
-    private _application: string;
-    private _router: IRouter | null;
+    private _open: (id: string) => Promise<void>;
     private _state: IStateDB;
     private _workspaces: WorkspaceManager;
   }
@@ -238,11 +124,10 @@ namespace Private {
      * Instantiation options for a `WorkspaceFactory`
      */
     export interface IOptions {
-      paths: JupyterFrontEnd.IPaths;
-      router: IRouter | null;
       state: IStateDB;
       translator: ITranslator;
       workspaces: WorkspaceManager;
+      open: (id: string) => Promise<void>;
     }
   }
 
@@ -256,59 +141,4 @@ namespace Private {
     widget.content.dispose();
     return widget;
   }
-
-  /**
-   * Ask user for a path to save to.
-   * @param defaultPath Path already present when the dialog is shown
-   */
-  async function getSavePath(
-    defaultPath: string,
-    translator?: ITranslator
-  ): Promise<string | null> {
-    translator = translator || nullTranslator;
-    const trans = translator.load('jupyterlab');
-    const saveBtn = Dialog.okButton({
-      label: trans.__('Save'),
-      ariaLabel: trans.__('Save Current Workspace')
-    });
-    const result = await showDialog({
-      title: trans.__('Save Current Workspace As…'),
-      body: new SaveWidget(defaultPath),
-      buttons: [Dialog.cancelButton(), saveBtn]
-    });
-    if (result.button.label === trans.__('Save')) {
-      return result.value;
-    } else {
-      return null;
-    }
-  }
-
-  /**
-   * A widget that gets a file path from a user.
-   */
-  class SaveWidget extends Widget {
-    /**
-     * Gets a modal node for getting save location. Will have a default to the current opened directory
-     * @param path Default location
-     */
-    constructor(path: string) {
-      super({ node: createSaveNode(path) });
-    }
-
-    /**
-     * Gets the save path entered by the user
-     */
-    getValue(): string {
-      return (this.node as HTMLInputElement).value;
-    }
-  }
-
-  /**
-   * Create the node for a save widget.
-   */
-  function createSaveNode(path: string): HTMLElement {
-    const input = document.createElement('input');
-    input.value = path;
-    return input;
-  }
 }

package/style/index.css

@@ -10,6 +10,5 @@
 @import url('~@jupyterlab/apputils/style/index.css');
 @import url('~@jupyterlab/docregistry/style/index.css');
 @import url('~@jupyterlab/application/style/index.css');
-@import url('~@jupyterlab/filebrowser/style/index.css');
 @import url('~@jupyterlab/mainmenu/style/index.css');
 @import url('./base.css');

package/style/index.js

@@ -10,7 +10,6 @@ import '@jupyterlab/statusbar/style/index.js';
 import '@jupyterlab/apputils/style/index.js';
 import '@jupyterlab/docregistry/style/index.js';
 import '@jupyterlab/application/style/index.js';
-import '@jupyterlab/filebrowser/style/index.js';
 import '@jupyterlab/mainmenu/style/index.js';
 
 import './base.css';

package/style/splash.css

@@ -19,7 +19,7 @@
 }
 
 #jupyterlab-splash.dark {
-  background-color: var(--md-grey-900);
+  background-color: var(--md-grey-900, #212121);
 }
 
 .splash-fade {

package/schema/workspaces.json

@@ -1,24 +0,0 @@
-{
-  "title": "Workspaces",
-  "description": "Workspaces settings.",
-  "jupyter.lab.menus": {
-    "main": [
-      {
-        "id": "jp-mainmenu-file",
-        "items": [
-          {
-            "command": "workspace-ui:save-as",
-            "rank": 40
-          },
-          {
-            "command": "workspace-ui:save",
-            "rank": 40
-          }
-        ]
-      }
-    ]
-  },
-  "additionalProperties": false,
-  "properties": {},
-  "type": "object"
-}