@jupytergis/jupytergis-core 0.1.5 → 0.1.7

package/lib/factory.d.ts

@@ -1,5 +1,5 @@
 import { ConsolePanel, IConsoleTracker } from '@jupyterlab/console';
-import { ICollaborativeDrive } from '@jupyter/docprovider';
+import { ICollaborativeDrive } from '@jupyter/collaborative-drive';
 import { JupyterGISModel, IJupyterGISTracker, IJGISExternalCommandRegistry } from '@jupytergis/schema';
 import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
 import { IEditorMimeTypeService } from '@jupyterlab/codeeditor';

package/lib/jgisplugin/modelfactory.d.ts

@@ -8,7 +8,7 @@ export declare class JupyterGISModelFactory implements DocumentRegistry.IModelFa
     /**
      * Whether the model is collaborative or not.
      */
-    readonly collaborative = true;
+    readonly collaborative: boolean;
     /**
      * The name of the model.
      *

package/lib/jgisplugin/modelfactory.js

@@ -7,7 +7,7 @@ export class JupyterGISModelFactory {
         /**
          * Whether the model is collaborative or not.
          */
-        this.collaborative = true;
+        this.collaborative = document.querySelectorAll('[data-jupyter-lite-root]')[0] === undefined;
         this._disposed = false;
     }
     /**

package/lib/jgisplugin/plugins.js

@@ -1,22 +1,29 @@
-import { ICollaborativeDrive } from '@jupyter/docprovider';
+import { ICollaborativeDrive } from '@jupyter/collaborative-drive';
 import { IJGISExternalCommandRegistryToken, IJupyterGISDocTracker, JupyterGISDoc } from '@jupytergis/schema';
 import { ICommandPalette, IThemeManager } from '@jupyterlab/apputils';
 import { IEditorServices } from '@jupyterlab/codeeditor';
 import { ConsolePanel, IConsoleTracker } from '@jupyterlab/console';
+import { PageConfig } from '@jupyterlab/coreutils';
 import { IFileBrowserFactory } from '@jupyterlab/filebrowser';
 import { ILauncher } from '@jupyterlab/launcher';
 import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
-import { CommandIDs, logoIcon } from '@jupytergis/base';
+import { CommandIDs, logoIcon, logoMiniIcon } from '@jupytergis/base';
 import { JupyterGISWidgetFactory } from '../factory';
 import { JupyterGISModelFactory } from './modelfactory';
+import { MimeDocumentFactory } from '@jupyterlab/docregistry';
 const FACTORY = 'JupyterGIS .jgis Viewer';
+const CONTENT_TYPE = 'jgis';
 const PALETTE_CATEGORY = 'JupyterGIS';
+const MODEL_NAME = 'jupytergis-jgismodel';
 const activate = (app, tracker, themeManager, browserFactory, externalCommandRegistry, contentFactory, editorServices, rendermime, consoleTracker, launcher, palette, drive) => {
+    if (PageConfig.getOption('jgis_expose_maps')) {
+        window.jupytergisMaps = {};
+    }
     const widgetFactory = new JupyterGISWidgetFactory({
         name: FACTORY,
-        modelName: 'jupytergis-jgismodel',
-        fileTypes: ['jgis'],
-        defaultFor: ['jgis'],
+        modelName: MODEL_NAME,
+        fileTypes: [CONTENT_TYPE],
+        defaultFor: [CONTENT_TYPE],
         tracker,
         commands: app.commands,
         externalCommandRegistry,
@@ -29,35 +36,57 @@ const activate = (app, tracker, themeManager, browserFactory, externalCommandReg
     });
     // Registering the widget factory
     app.docRegistry.addWidgetFactory(widgetFactory);
+    const mimeDocumentFactory = new MimeDocumentFactory({
+        dataType: 'json',
+        rendermime,
+        modelName: MODEL_NAME,
+        name: 'JSON Editor',
+        primaryFileType: app.docRegistry.getFileType('json'),
+        fileTypes: [CONTENT_TYPE]
+    });
+    app.docRegistry.addWidgetFactory(mimeDocumentFactory);
     // Creating and registering the model factory for our custom DocumentModel
     const modelFactory = new JupyterGISModelFactory();
     app.docRegistry.addModelFactory(modelFactory);
     // register the filetype
     app.docRegistry.addFileType({
-        name: 'jgis',
+        name: CONTENT_TYPE,
         displayName: 'JGIS',
         mimeTypes: ['text/json'],
         extensions: ['.jgis', '.JGIS'],
         fileFormat: 'text',
-        contentType: 'jgis'
+        contentType: CONTENT_TYPE,
+        icon: logoMiniIcon
     });
     const jGISSharedModelFactory = () => {
         return new JupyterGISDoc();
     };
     if (drive) {
-        drive.sharedModelFactory.registerDocumentFactory('jgis', jGISSharedModelFactory);
+        drive.sharedModelFactory.registerDocumentFactory(CONTENT_TYPE, jGISSharedModelFactory);
     }
     widgetFactory.widgetCreated.connect((sender, widget) => {
+        widget.title.icon = logoIcon;
         widget.context.pathChanged.connect(() => {
             tracker.save(widget);
         });
         themeManager.themeChanged.connect((_, changes) => widget.context.model.themeChanged.emit(changes));
-        tracker.add(widget);
         app.shell.activateById('jupytergis::leftControlPanel');
         app.shell.activateById('jupytergis::rightControlPanel');
+        tracker
+            .add(widget)
+            .then(() => {
+            Object.values(CommandIDs).forEach(id => {
+                if (app.commands.hasCommand(id)) {
+                    app.commands.notifyCommandChanged(id);
+                }
+            });
+        })
+            .catch(e => {
+            console.error('Cannot update JupyterGIS commands', e);
+        });
     });
     app.commands.addCommand(CommandIDs.createNew, {
-        label: args => 'New JGIS File',
+        label: args => 'GIS File',
         caption: 'Create a new JGIS Editor',
         icon: args => logoIcon,
         execute: async (args) => {
@@ -72,7 +101,7 @@ const activate = (app, tracker, themeManager, browserFactory, externalCommandReg
                 type: 'file',
                 ext: '.jGIS'
             });
-            model = await app.serviceManager.contents.save(model.path, Object.assign(Object.assign({}, model), { format: 'text', size: undefined, content: '{\n\t"layers": {},\n\t"sources": {},\n\t"options": {"latitude": 0, "longitude": 0, "zoom": 0, "bearing": 0, "pitch": 0, "projection": "EPSG:3857"},\n\t"layerTree": [],\n}' }));
+            model = await app.serviceManager.contents.save(model.path, Object.assign(Object.assign({}, model), { format: 'text', size: undefined, content: '{\n\t"layers": {},\n\t"sources": {},\n\t"options": {"latitude": 0, "longitude": 0, "zoom": 0, "bearing": 0, "pitch": 0, "projection": "EPSG:3857"},\n\t"layerTree": []\n}' }));
             // Open the newly created file with the 'Editor'
             return app.commands.execute('docmanager:open', {
                 path: model.path,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupytergis/jupytergis-core",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "JupyterGIS core extension",
   "keywords": [
     "jupyter",
@@ -52,23 +52,23 @@
     "watch:labextension": "jupyter labextension watch ."
   },
   "dependencies": {
-    "@jupyter/docprovider": "^2.0.0",
-    "@jupytergis/base": "^0.1.5",
-    "@jupytergis/schema": "^0.1.5",
-    "@jupyterlab/application": "^4.0.0",
-    "@jupyterlab/apputils": "^4.0.0",
-    "@jupyterlab/docregistry": "^4.0.0",
-    "@jupyterlab/filebrowser": "^4.0.0",
-    "@jupyterlab/launcher": "^4.0.0",
-    "@jupyterlab/mainmenu": "^4.0.0",
-    "@jupyterlab/services": "^7.0.0",
-    "@jupyterlab/translation": "^4.0.0",
-    "@jupyterlab/ui-components": "^4.0.0",
+    "@jupyter/collaborative-drive": "^3.0.0",
+    "@jupytergis/base": "^0.1.7",
+    "@jupytergis/schema": "^0.1.7",
+    "@jupyterlab/application": "^4.3.0",
+    "@jupyterlab/apputils": "^4.3.0",
+    "@jupyterlab/docregistry": "^4.3.0",
+    "@jupyterlab/filebrowser": "^4.3.0",
+    "@jupyterlab/launcher": "^4.3.0",
+    "@jupyterlab/mainmenu": "^4.3.0",
+    "@jupyterlab/services": "^7.3.0",
+    "@jupyterlab/translation": "^4.3.0",
+    "@jupyterlab/ui-components": "^4.3.0",
     "@lumino/commands": "^2.0.0",
     "util": "^0.12.5"
   },
   "devDependencies": {
-    "@jupyterlab/builder": "^4.0.0",
+    "@jupyterlab/builder": "^4.3.0",
     "@types/json-schema": "^7.0.11",
     "@types/react": "^18.0.26",
     "@types/react-addons-linked-state-mixin": "^0.14.22",