@jupytergis/jupytergis-core 0.6.2 → 0.7.0

package/lib/factory.d.ts

@@ -1,11 +1,12 @@
 import { ICollaborativeDrive } from '@jupyter/collaborative-drive';
 import { JupyterGISDocumentWidget } from '@jupytergis/base';
-import { JupyterGISModel, IJupyterGISTracker, IJGISExternalCommandRegistry } from '@jupytergis/schema';
+import { JupyterGISModel, IJupyterGISTracker, IJGISExternalCommandRegistry, IJGISFormSchemaRegistry, IAnnotationModel } from '@jupytergis/schema';
 import { IEditorMimeTypeService } from '@jupyterlab/codeeditor';
 import { ConsolePanel, IConsoleTracker } from '@jupyterlab/console';
 import { ABCWidgetFactory, DocumentRegistry } from '@jupyterlab/docregistry';
 import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
 import { ServiceManager } from '@jupyterlab/services';
+import { IStateDB } from '@jupyterlab/statedb';
 import { CommandRegistry } from '@lumino/commands';
 interface IOptions extends DocumentRegistry.IWidgetFactoryOptions {
     tracker: IJupyterGISTracker;
@@ -18,6 +19,9 @@ interface IOptions extends DocumentRegistry.IWidgetFactoryOptions {
     consoleTracker?: IConsoleTracker;
     backendCheck?: () => boolean;
     drive?: ICollaborativeDrive | null;
+    formSchemaRegistry: IJGISFormSchemaRegistry;
+    state: IStateDB;
+    annotationModel: IAnnotationModel;
 }
 export declare class JupyterGISDocumentWidgetFactory extends ABCWidgetFactory<JupyterGISDocumentWidget, JupyterGISModel> {
     private options;

package/lib/factory.js

@@ -51,12 +51,19 @@ export class JupyterGISDocumentWidgetFactory extends ABCWidgetFactory {
             rendermime: this.options.rendermime,
             consoleTracker: this.options.consoleTracker,
             commandRegistry: this.options.commands,
+            state: this.options.state,
+            formSchemaRegistry: this.options.formSchemaRegistry,
+            annotationModel: this.options.annotationModel,
         });
         const toolbar = new ToolbarWidget({
             commands: this._commands,
             model,
             externalCommands: this._externalCommandRegistry.getCommands(),
         });
-        return new JupyterGISDocumentWidget({ context, content, toolbar });
+        return new JupyterGISDocumentWidget({
+            context,
+            content,
+            toolbar,
+        });
     }
 }

package/lib/jgisplugin/plugins.js

@@ -1,6 +1,6 @@
 import { ICollaborativeDrive, } from '@jupyter/collaborative-drive';
 import { CommandIDs, logoIcon, logoMiniIcon } from '@jupytergis/base';
-import { IAnnotationToken, IJGISExternalCommandRegistryToken, IJupyterGISDocTracker, JupyterGISDoc, SCHEMA_VERSION, ProcessingMerge, } from '@jupytergis/schema';
+import { IAnnotationToken, IJGISExternalCommandRegistryToken, IJupyterGISDocTracker, JupyterGISDoc, SCHEMA_VERSION, ProcessingMerge, IJGISFormSchemaRegistryToken, } from '@jupytergis/schema';
 import { ICommandPalette, IThemeManager, } from '@jupyterlab/apputils';
 import { IEditorServices } from '@jupyterlab/codeeditor';
 import { ConsolePanel, IConsoleTracker } from '@jupyterlab/console';
@@ -10,6 +10,7 @@ import { IFileBrowserFactory } from '@jupyterlab/filebrowser';
 import { ILauncher } from '@jupyterlab/launcher';
 import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
 import { ISettingRegistry } from '@jupyterlab/settingregistry';
+import { IStateDB } from '@jupyterlab/statedb';
 import { JupyterGISDocumentWidgetFactory } from '../factory';
 import { JupyterGISModelFactory } from './modelfactory';
 const FACTORY = 'JupyterGIS .jgis Viewer';
@@ -17,7 +18,8 @@ const CONTENT_TYPE = 'jgis';
 const PALETTE_CATEGORY = 'JupyterGIS';
 const MODEL_NAME = 'jupytergis-jgismodel';
 const SETTINGS_ID = '@jupytergis/jupytergis-core:jupytergis-settings';
-const activate = async (app, tracker, themeManager, browserFactory, externalCommandRegistry, contentFactory, editorServices, rendermime, consoleTracker, annotationModel, settingRegistry, launcher, palette, drive) => {
+const activate = async (app, tracker, themeManager, browserFactory, externalCommandRegistry, contentFactory, editorServices, rendermime, consoleTracker, annotationModel, settingRegistry, formSchemaRegistry, state, launcher, palette, drive) => {
+    formSchemaRegistry && state;
     if (PageConfig.getOption('jgis_expose_maps')) {
         window.jupytergisMaps = {};
     }
@@ -41,7 +43,10 @@ const activate = async (app, tracker, themeManager, browserFactory, externalComm
         contentFactory,
         rendermime,
         mimeTypeService: editorServices.mimeTypeService,
+        formSchemaRegistry: formSchemaRegistry,
         consoleTracker,
+        state: state,
+        annotationModel: annotationModel,
     });
     // Registering the widget factory
     app.docRegistry.addWidgetFactory(widgetFactory);
@@ -190,6 +195,8 @@ const jGISPlugin = {
         IConsoleTracker,
         IAnnotationToken,
         ISettingRegistry,
+        IJGISFormSchemaRegistryToken,
+        IStateDB,
     ],
     optional: [ILauncher, ICommandPalette, ICollaborativeDrive],
     autoStart: true,

package/package.json

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