@jupytergis/jupytergis-core 0.2.1 → 0.4.0

package/lib/factory.d.ts

@@ -5,7 +5,7 @@ import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
 import { IEditorMimeTypeService } from '@jupyterlab/codeeditor';
 import { ABCWidgetFactory, DocumentRegistry } from '@jupyterlab/docregistry';
 import { CommandRegistry } from '@lumino/commands';
-import { JupyterGISWidget } from '@jupytergis/base';
+import { JupyterGISDocumentWidget } from '@jupytergis/base';
 import { ServiceManager } from '@jupyterlab/services';
 interface IOptions extends DocumentRegistry.IWidgetFactoryOptions {
     tracker: IJupyterGISTracker;
@@ -19,7 +19,7 @@ interface IOptions extends DocumentRegistry.IWidgetFactoryOptions {
     backendCheck?: () => boolean;
     drive?: ICollaborativeDrive | null;
 }
-export declare class JupyterGISWidgetFactory extends ABCWidgetFactory<JupyterGISWidget, JupyterGISModel> {
+export declare class JupyterGISDocumentWidgetFactory extends ABCWidgetFactory<JupyterGISDocumentWidget, JupyterGISModel> {
     private options;
     constructor(options: IOptions);
     /**
@@ -28,7 +28,7 @@ export declare class JupyterGISWidgetFactory extends ABCWidgetFactory<JupyterGIS
      * @param context Contains the information of the file
      * @returns The widget
      */
-    protected createNewWidget(context: DocumentRegistry.IContext<JupyterGISModel>): JupyterGISWidget;
+    protected createNewWidget(context: DocumentRegistry.IContext<JupyterGISModel>): JupyterGISDocumentWidget;
     private _commands;
     private _externalCommandRegistry;
     private _backendCheck?;

package/lib/factory.js

@@ -10,8 +10,8 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 import { ABCWidgetFactory } from '@jupyterlab/docregistry';
-import { JupyterGISPanel, JupyterGISWidget, ToolbarWidget } from '@jupytergis/base';
-export class JupyterGISWidgetFactory extends ABCWidgetFactory {
+import { JupyterGISPanel, JupyterGISDocumentWidget, ToolbarWidget } from '@jupytergis/base';
+export class JupyterGISDocumentWidgetFactory extends ABCWidgetFactory {
     constructor(options) {
         var _a;
         const { backendCheck, externalCommandRegistry } = options, rest = __rest(options, ["backendCheck", "externalCommandRegistry"]);
@@ -36,8 +36,9 @@ export class JupyterGISWidgetFactory extends ABCWidgetFactory {
             }
         }
         const { model } = context;
+        model.filePath = context.localPath;
         if (this._contentsManager) {
-            model.setContentsManager(this._contentsManager, context.path);
+            model.contentsManager = this._contentsManager;
         }
         const content = new JupyterGISPanel({
             model,
@@ -53,6 +54,6 @@ export class JupyterGISWidgetFactory extends ABCWidgetFactory {
             model,
             externalCommands: this._externalCommandRegistry.getCommands()
         });
-        return new JupyterGISWidget({ context, content, toolbar });
+        return new JupyterGISDocumentWidget({ context, content, toolbar });
     }
 }

package/lib/jgisplugin/modelfactory.d.ts

@@ -9,7 +9,7 @@ export declare class JupyterGISModelFactory implements DocumentRegistry.IModelFa
     /**
      * Whether the model is collaborative or not.
      */
-    readonly collaborative: boolean;
+    readonly collaborative = true;
     /**
      * 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 = document.querySelectorAll('[data-jupyter-lite-root]')[0] === undefined;
+        this.collaborative = true;
         this._disposed = false;
         this._annotationModel = options.annotationModel;
     }

package/lib/jgisplugin/plugins.js

@@ -8,7 +8,7 @@ import { IFileBrowserFactory } from '@jupyterlab/filebrowser';
 import { ILauncher } from '@jupyterlab/launcher';
 import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
 import { CommandIDs, logoIcon, logoMiniIcon } from '@jupytergis/base';
-import { JupyterGISWidgetFactory } from '../factory';
+import { JupyterGISDocumentWidgetFactory } from '../factory';
 import { JupyterGISModelFactory } from './modelfactory';
 import { MimeDocumentFactory } from '@jupyterlab/docregistry';
 const FACTORY = 'JupyterGIS .jgis Viewer';
@@ -19,7 +19,7 @@ const activate = (app, tracker, themeManager, browserFactory, externalCommandReg
     if (PageConfig.getOption('jgis_expose_maps')) {
         window.jupytergisMaps = {};
     }
-    const widgetFactory = new JupyterGISWidgetFactory({
+    const widgetFactory = new JupyterGISDocumentWidgetFactory({
         name: FACTORY,
         modelName: MODEL_NAME,
         fileTypes: [CONTENT_TYPE],
@@ -68,7 +68,7 @@ const activate = (app, tracker, themeManager, browserFactory, externalCommandReg
         widget.context.pathChanged.connect(() => {
             tracker.save(widget);
         });
-        themeManager.themeChanged.connect((_, changes) => widget.context.model.themeChanged.emit(changes));
+        themeManager.themeChanged.connect((_, changes) => widget.model.themeChanged.emit(changes));
         app.shell.activateById('jupytergis::leftControlPanel');
         app.shell.activateById('jupytergis::rightControlPanel');
         tracker

package/lib/plugin.js

@@ -3,6 +3,7 @@ import { IAnnotationToken, IJGISExternalCommandRegistryToken, IJGISFormSchemaReg
 import { WidgetTracker } from '@jupyterlab/apputils';
 import { IMainMenu } from '@jupyterlab/mainmenu';
 import { ITranslator } from '@jupyterlab/translation';
+import { IDocumentManager } from '@jupyterlab/docmanager';
 import { JupyterGISExternalCommandRegistry } from './externalcommand';
 import { JupyterGISLayerBrowserRegistry } from './layerBrowserRegistry';
 import { JupyterGISFormSchemaRegistry } from './schemaregistry';
@@ -24,10 +25,10 @@ export const trackerPlugin = {
 export const formSchemaRegistryPlugin = {
     id: 'jupytergis:core:form-schema-registry',
     autoStart: true,
-    requires: [],
+    requires: [IDocumentManager],
     provides: IJGISFormSchemaRegistryToken,
-    activate: (app) => {
-        const registry = new JupyterGISFormSchemaRegistry();
+    activate: (app, docmanager) => {
+        const registry = new JupyterGISFormSchemaRegistry(docmanager);
         return registry;
     }
 };
@@ -60,10 +61,10 @@ export const annotationPlugin = {
     activate: (app, tracker) => {
         var _a;
         const annotationModel = new AnnotationModel({
-            context: (_a = tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.context
+            model: (_a = tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.model
         });
         tracker.currentChanged.connect((_, changed) => {
-            annotationModel.context = (changed === null || changed === void 0 ? void 0 : changed.context) || undefined;
+            annotationModel.model = (changed === null || changed === void 0 ? void 0 : changed.model) || undefined;
         });
         return annotationModel;
     }

package/lib/schemaregistry.d.ts

@@ -1,8 +1,11 @@
 import { IDict, IJGISFormSchemaRegistry } from '@jupytergis/schema';
+import { IDocumentManager } from '@jupyterlab/docmanager';
 export declare class JupyterGISFormSchemaRegistry implements IJGISFormSchemaRegistry {
-    constructor();
+    private _docManager;
+    constructor(docManager: IDocumentManager);
     registerSchema(name: string, schema: IDict): void;
     has(name: string): boolean;
     getSchemas(): Map<string, IDict>;
+    getDocManager(): IDocumentManager;
     private _registry;
 }

package/lib/schemaregistry.js

@@ -1,7 +1,8 @@
 import formSchema from '@jupytergis/schema/lib/_interface/forms.json';
 export class JupyterGISFormSchemaRegistry {
-    constructor() {
+    constructor(docManager) {
         this._registry = new Map(Object.entries(formSchema));
+        this._docManager = docManager;
     }
     registerSchema(name, schema) {
         if (!this._registry.has(name)) {
@@ -17,4 +18,7 @@ export class JupyterGISFormSchemaRegistry {
     getSchemas() {
         return this._registry;
     }
+    getDocManager() {
+        return this._docManager;
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupytergis/jupytergis-core",
-  "version": "0.2.1",
+  "version": "0.4.0",
   "description": "JupyterGIS core extension",
   "keywords": [
     "jupyter",
@@ -53,8 +53,8 @@
   },
   "dependencies": {
     "@jupyter/collaborative-drive": "^3.0.0",
-    "@jupytergis/base": "^0.2.1",
-    "@jupytergis/schema": "^0.2.1",
+    "@jupytergis/base": "^0.4.0",
+    "@jupytergis/schema": "^0.4.0",
     "@jupyterlab/application": "^4.3.0",
     "@jupyterlab/apputils": "^4.3.0",
     "@jupyterlab/docregistry": "^4.3.0",