Remove concept of `defaultWorkspace`. It can be handled transparently.

jupyterlab/extension.py

@@ -136,7 +136,6 @@ def load_jupyter_server_extension(nbapp):
     page_config = web_app.settings.setdefault('page_config_data', dict())
     page_config['buildAvailable'] = not core_mode and not dev_mode
     page_config['buildCheck'] = not core_mode and not dev_mode
-    page_config['defaultWorkspace'] = ujoin(base_url, config.page_url)
     page_config['devMode'] = dev_mode
     page_config['token'] = nbapp.token
 

packages/application/src/frontend.ts

@@ -265,7 +265,6 @@ export namespace JupyterFrontEnd {
      */
     readonly urls: {
       readonly base: string;
-      readonly defaultWorkspace: string;
       readonly notFound?: string;
       readonly page: string;
       readonly public: string;

packages/application/src/lab.ts

@@ -238,7 +238,6 @@ export namespace JupyterLab {
   export const defaultPaths: JupyterFrontEnd.IPaths = {
     urls: {
       base: PageConfig.getOption('baseUrl'),
-      defaultWorkspace: PageConfig.getOption('defaultWorkspace'),
       notFound: PageConfig.getOption('notFoundUrl'),
       page: PageConfig.getOption('pageUrl'),
       public: PageConfig.getOption('publicUrl'),

packages/apputils-extension/src/index.ts

@@ -431,11 +431,9 @@ const state: JupyterFrontEndPlugin<IStateDB> = {
     const db = new StateDB({ transform: transform.promise });
     const save = new Debouncer(async () => {
       const id = workspace;
-      if (id) {
-        const metadata = { id };
-        const data = await db.toJSON();
-        await workspaces.save(id, { data, metadata });
-      }
+      const metadata = { id };
+      const data = await db.toJSON();
+      await workspaces.save(id, { data, metadata });
     });
 
     commands.addCommand(CommandIDs.loadState, {
@@ -452,7 +450,7 @@ const state: JupyterFrontEndPlugin<IStateDB> = {
         const clone =
           typeof query['clone'] === 'string'
             ? query['clone'] === ''
-              ? urls.defaultWorkspace
+              ? URLExt.join(paths.urls.base, paths.urls.page)
               : URLExt.join(urls.base, urls.workspaces, query['clone'])
             : null;
         const source = clone || workspace || null;
@@ -613,6 +611,6 @@ namespace Private {
   ): string {
     return workspace
       ? URLExt.join(paths.urls.base, paths.urls.workspaces, workspace)
-      : paths.urls.defaultWorkspace;
+      : URLExt.join(paths.urls.base, paths.urls.page);
   }
 }

packages/coreutils/src/pageconfig.ts

@@ -5,8 +5,6 @@ import { JSONExt } from '@phosphor/coreutils';
 
 import minimist from 'minimist';
 
-import { PathExt } from './path';
-
 import { URLExt } from './url';
 
 /**
@@ -19,16 +17,6 @@ declare var require: any;
  * The namespace for Page Config functions.
  */
 export namespace PageConfig {
-  /**
-   * The tree URL construction options.
-   */
-  export interface ITreeOptions {
-    /**
-     * If provided, the tree URL will include the current workspace, if any.
-     */
-    workspace?: string;
-  }
-
   /**
    * Get global configuration data for the Jupyter application.
    *
@@ -124,19 +112,9 @@ export namespace PageConfig {
 
   /**
    * Get the tree url for a JupyterLab application.
-   *
-   * @param options - The tree URL construction options.
    */
-  export function getTreeUrl(options: ITreeOptions = {}): string {
-    const base = getBaseUrl();
-    const tree = getOption('treeUrl');
-    const defaultWorkspace = getOption('defaultWorkspace');
-    const workspaces = getOption('workspacesUrl');
-    const workspace = options.workspace || '';
-
-    return workspace && workspace !== defaultWorkspace
-      ? URLExt.join(base, workspaces, PathExt.basename(workspace), 'tree')
-      : URLExt.join(base, tree);
+  export function getTreeUrl(): string {
+    return URLExt.join(getBaseUrl(), getOption('treeUrl'));
   }
 
   /**