jupyter-specta 0.1.4 → 0.1.5

package/lib/document/plugin.js

@@ -1,11 +1,13 @@
 import { WidgetTracker } from '@jupyterlab/apputils';
 import { IEditorServices } from '@jupyterlab/codeeditor';
+import { PathExt } from '@jupyterlab/coreutils';
+import { IDocumentManager } from '@jupyterlab/docmanager';
+import { IDefaultFileBrowser } from '@jupyterlab/filebrowser';
 import { INotebookTracker, NotebookPanel } from '@jupyterlab/notebook';
 import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
-import { IDocumentManager } from '@jupyterlab/docmanager';
-import { createFileBrowser, hideAppLoadingIndicator, isSpectaApp, registerDocumentFactory } from '../tool';
-import { ISpectaDocTracker, ISpectaLayoutRegistry } from '../token';
 import { IKernelSpecManager } from '@jupyterlab/services';
+import { ISpectaDocTracker, ISpectaLayoutRegistry } from '../token';
+import { createFileBrowser, hideAppLoadingIndicator, isSpectaApp, registerDocumentFactory } from '../tool';
 const activate = (app, rendermime, tracker, editorServices, contentFactory, spectaLayoutRegistry) => {
     const namespace = 'specta';
     const spectaTracker = new WidgetTracker({ namespace });
@@ -37,8 +39,13 @@ export const spectaDocument = {
 export const spectaOpener = {
     id: 'specta/application-extension:opener',
     autoStart: true,
-    requires: [IDocumentManager, ISpectaDocTracker, IKernelSpecManager],
-    activate: async (app, docManager) => {
+    requires: [
+        IDocumentManager,
+        IDefaultFileBrowser,
+        ISpectaDocTracker,
+        IKernelSpecManager
+    ],
+    activate: async (app, docManager, defaultBrowser) => {
         if (!isSpectaApp()) {
             // Not a specta app, return
             return;
@@ -46,14 +53,37 @@ export const spectaOpener = {
         const urlParams = new URLSearchParams(window.location.search);
         const path = urlParams.get('path');
         if (!path) {
-            const browser = createFileBrowser({ docManager });
+            const browser = createFileBrowser({ defaultBrowser });
             app.shell.add(browser, 'main', { rank: 100 });
             hideAppLoadingIndicator();
         }
         else {
-            const widget = docManager.openOrReveal(path, 'specta');
-            if (widget) {
-                app.shell.add(widget, 'main');
+            if (PathExt.extname(path) === '.ipynb') {
+                app.shell.addClass('specta-document-viewer');
+                const widget = docManager.openOrReveal(path, 'specta');
+                if (widget) {
+                    app.shell.add(widget, 'main');
+                }
+            }
+            else {
+                let count = 0;
+                const tryOpen = () => {
+                    const widget = docManager.openOrReveal(path);
+                    if (widget) {
+                        app.shell.add(widget, 'main');
+                        hideAppLoadingIndicator();
+                    }
+                    else {
+                        count++;
+                        if (count > 10) {
+                            console.error('Failed to open file', path);
+                            //TODO Open in text editor?
+                            return;
+                        }
+                        setTimeout(tryOpen, 100);
+                    }
+                };
+                tryOpen();
             }
         }
     }

package/lib/tool.d.ts

@@ -1,13 +1,11 @@
 import { JupyterFrontEnd } from '@jupyterlab/application';
 import { WidgetTracker } from '@jupyterlab/apputils';
 import { IEditorServices } from '@jupyterlab/codeeditor';
+import { IDefaultFileBrowser } from '@jupyterlab/filebrowser';
+import { ICell, INotebookMetadata } from '@jupyterlab/nbformat';
 import { INotebookTracker, NotebookPanel } from '@jupyterlab/notebook';
 import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
-import { VoilaFileBrowser } from '@voila-dashboards/voila';
-import { IDocumentManager } from '@jupyterlab/docmanager';
 import { ISpectaAppConfig, ISpectaCellConfig, ISpectaLayoutRegistry } from './token';
-import { INotebookMetadata } from '@jupyterlab/nbformat';
-import { ICell } from '@jupyterlab/nbformat';
 export declare function registerDocumentFactory(options: {
     factoryName: string;
     app: JupyterFrontEnd;
@@ -19,8 +17,8 @@ export declare function registerDocumentFactory(options: {
     spectaLayoutRegistry: ISpectaLayoutRegistry;
 }): void;
 export declare function createFileBrowser(options: {
-    docManager: IDocumentManager;
-}): VoilaFileBrowser;
+    defaultBrowser: IDefaultFileBrowser;
+}): any;
 export declare function hideAppLoadingIndicator(): void;
 export declare function isSpectaApp(): boolean;
 export declare function readSpectaConfig(nbMetadata?: INotebookMetadata): ISpectaAppConfig;

package/lib/tool.js

@@ -1,7 +1,5 @@
 import { PageConfig, URLExt } from '@jupyterlab/coreutils';
-import { FilterFileBrowserModel } from '@jupyterlab/filebrowser';
 import { NotebookModelFactory } from '@jupyterlab/notebook';
-import { VoilaFileBrowser } from '@voila-dashboards/voila';
 import { NotebookGridWidgetFactory } from './document/factory';
 import { SpectaWidgetFactory } from './specta_widget_factory';
 export function registerDocumentFactory(options) {
@@ -43,11 +41,12 @@ export function registerDocumentFactory(options) {
     });
 }
 export function createFileBrowser(options) {
-    const { docManager } = options;
-    const model = new FilterFileBrowserModel({
-        manager: docManager,
-        auto: true
-    });
+    const { defaultBrowser } = options;
+    const browser = defaultBrowser;
+    browser.singleClickNavigation = true;
+    browser.showFileCheckboxes = false;
+    browser.showLastModifiedColumn = false;
+    browser.addClass('specta-file-browser');
     const urlFactory = (path) => {
         const baseUrl = PageConfig.getBaseUrl();
         let appUrl = PageConfig.getOption('appUrl');
@@ -63,16 +62,16 @@ export function createFileBrowser(options) {
         });
         return url.toString();
     };
-    const browser = new VoilaFileBrowser({
-        id: 'filebrowser',
-        model,
-        restore: false,
-        urlFactory,
-        title: 'Select items to open with Specta.'
-    });
-    browser.showFileCheckboxes = false;
-    browser.showLastModifiedColumn = false;
-    browser.addClass('specta-file-browser');
+    const oldHandler = browser.listing.handleOpen.bind(browser.listing);
+    browser.listing.handleOpen = (item) => {
+        if (item.type === 'directory') {
+            oldHandler(item);
+            return;
+        }
+        else {
+            window.open(urlFactory(item.path), '_blank');
+        }
+    };
     return browser;
 }
 export function hideAppLoadingIndicator() {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "jupyter-specta",
-    "version": "0.1.4",
+    "version": "0.1.5",
     "description": "",
     "keywords": [],
     "homepage": "https://github.com/trungleduc/specta",
@@ -41,6 +41,9 @@
         "lint:eslint": "eslint --ext .ts,.tsx .",
         "install:extension": "npm run build:lib && npm run build:labextension:dev"
     },
+    "overrides": {
+        "@microsoft/fast-foundation": "~2.49.5"
+    },
     "dependencies": {
         "@jupyter-notebook/tree": "^7.4.3",
         "@jupyter-widgets/base": "^6.0.6",
@@ -49,6 +52,7 @@
         "@jupyterlab/apputils": "^4.4.2",
         "@jupyterlab/apputils-extension": "^4.4.2",
         "@jupyterlab/console": "^4.4.2",
+        "@jupyterlab/console-extension": "^4.4.2",
         "@jupyterlab/coreutils": "^6.4.2",
         "@jupyterlab/docmanager": "^4.4.2",
         "@jupyterlab/docmanager-extension": "^4.4.2",
@@ -76,6 +80,7 @@
         "@jupyterlab/translation": "^4.4.2",
         "@jupyterlab/translation-extension": "^4.4.2",
         "@jupyterlab/ui-components": "^4.4.2",
+        "@jupyterlab/ui-components-extension": "~4.4.2",
         "@jupyterlite/application": "^0.6.2",
         "@jupyterlite/application-extension": "^0.6.2",
         "@jupyterlite/contents": "^0.6.2",

package/style/style.css

@@ -4,7 +4,7 @@
   background: var(--jp-layout-color1);
 }
 
-#jp-main-content-panel jp-toolbar {
+.specta-document-viewer #jp-main-content-panel jp-toolbar {
   display: none;
 }