@jupytergis/jupytergis-lab 0.1.1 → 0.1.3

package/lib/index.js

@@ -1,4 +1,4 @@
-import { CommandIDs, ControlPanelModel, LeftPanelWidget, RightPanelWidget, addCommands, createDefaultLayerRegistry } from '@jupytergis/base';
+import { CommandIDs, ControlPanelModel, LeftPanelWidget, RightPanelWidget, addCommands, createDefaultLayerRegistry, logoMiniIcon } from '@jupytergis/base';
 import { IJGISFormSchemaRegistryToken, IJGISLayerBrowserRegistryToken, IJupyterGISDocTracker } from '@jupytergis/schema';
 import { ILayoutRestorer } from '@jupyterlab/application';
 import { ICompletionProviderManager } from '@jupyterlab/completer';
@@ -218,8 +218,7 @@ const controlPanel = {
         });
         leftControlPanel.id = 'jupytergis::leftControlPanel';
         leftControlPanel.title.caption = 'JupyterGIS Control Panel';
-        // TODO Need an icon
-        // leftControlPanel.title.icon = jcLightIcon;
+        leftControlPanel.title.icon = logoMiniIcon;
         const rightControlPanel = new RightPanelWidget({
             model: controlModel,
             tracker,
@@ -227,8 +226,7 @@ const controlPanel = {
         });
         rightControlPanel.id = 'jupytergis::rightControlPanel';
         rightControlPanel.title.caption = 'JupyterGIS Control Panel';
-        // TODO Need an icon
-        // rightControlPanel.title.icon = jcLightIcon;
+        rightControlPanel.title.icon = logoMiniIcon;
         if (restorer) {
             restorer.add(leftControlPanel, NAME_SPACE);
             restorer.add(rightControlPanel, NAME_SPACE);

package/lib/notebookrenderer.js

@@ -1,13 +1,9 @@
-import { WebSocketProvider } from '@jupyter/docprovider';
+import { ICollaborativeDrive } from '@jupyter/docprovider';
 import { JupyterGISPanel } from '@jupytergis/base';
 import { JupyterGISModel } from '@jupytergis/schema';
-import { URLExt } from '@jupyterlab/coreutils';
-import { ServerConnection } from '@jupyterlab/services';
-import { ITranslator, nullTranslator } from '@jupyterlab/translation';
 import { MessageLoop } from '@lumino/messaging';
 import { Panel, Widget } from '@lumino/widgets';
 import { IJupyterYWidgetManager, JupyterYModel } from 'yjs-widgets';
-const Y_DOCUMENT_PROVIDER_URL = 'api/collaboration/room';
 export const CLASS_NAME = 'jupytergis-notebook-widget';
 export class YJupyterGISModel extends JupyterYModel {
 }
@@ -27,46 +23,29 @@ export class YJupyterGISLuminoWidget extends Panel {
 export const notebookRenderePlugin = {
     id: 'jupytergis:yjswidget-plugin',
     autoStart: true,
-    optional: [IJupyterYWidgetManager, ITranslator],
-    activate: (app, yWidgetManager, translator) => {
+    optional: [IJupyterYWidgetManager, ICollaborativeDrive],
+    activate: (app, yWidgetManager, drive) => {
         if (!yWidgetManager) {
             console.error('Missing IJupyterYWidgetManager token!');
             return;
         }
-        const labTranslator = translator !== null && translator !== void 0 ? translator : nullTranslator;
+        if (!drive) {
+            console.error('Cannot setup JupyterGIS Python API without a collaborative drive');
+            return;
+        }
         class YJupyterGISModelFactory extends YJupyterGISModel {
             ydocFactory(commMetadata) {
                 const { path, format, contentType } = commMetadata;
-                this.jupyterGISModel = new JupyterGISModel({});
-                const user = app.serviceManager.user;
-                if (path && format && contentType) {
-                    const server = ServerConnection.makeSettings();
-                    const serverUrl = URLExt.join(server.wsUrl, Y_DOCUMENT_PROVIDER_URL);
-                    const ywsProvider = new WebSocketProvider({
-                        url: serverUrl,
-                        path,
-                        format,
-                        contentType,
-                        model: this.jupyterGISModel.sharedModel,
-                        user,
-                        translator: labTranslator.load('jupyterlab')
-                    });
-                    this.jupyterGISModel.disposed.connect(() => {
-                        ywsProvider.dispose();
-                    });
-                }
-                else {
-                    const awareness = this.jupyterGISModel.sharedModel.awareness;
-                    const _onUserChanged = (user) => {
-                        awareness.setLocalStateField('user', user.identity);
-                    };
-                    user.ready
-                        .then(() => {
-                        _onUserChanged(user);
-                    })
-                        .catch(e => console.error(e));
-                    user.userChanged.connect(_onUserChanged, this);
-                }
+                const fileFormat = format;
+                const sharedModel = drive.sharedModelFactory.createNew({
+                    path,
+                    format: fileFormat,
+                    contentType,
+                    collaborative: true
+                });
+                this.jupyterGISModel = new JupyterGISModel({
+                    sharedModel: sharedModel
+                });
                 return this.jupyterGISModel.sharedModel.ydoc;
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupytergis/jupytergis-lab",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "JupyterGIS Lab extension.",
   "keywords": [
     "jupyter",
@@ -53,9 +53,9 @@
   },
   "dependencies": {
     "@jupyter/docprovider": "^2.0.0",
-    "@jupytergis/base": "^0.1.1",
-    "@jupytergis/jupytergis-core": "^0.1.1",
-    "@jupytergis/schema": "^0.1.1",
+    "@jupytergis/base": "^0.1.3",
+    "@jupytergis/jupytergis-core": "^0.1.3",
+    "@jupytergis/schema": "^0.1.3",
     "@jupyterlab/application": "^4.0.0",
     "@jupyterlab/apputils": "^4.0.0",
     "@jupyterlab/coreutils": "^6.0.0",