@jupytergis/jupytergis-core 0.10.1 → 0.12.0

package/lib/factory.d.ts

@@ -1,11 +1,10 @@
-import { ICollaborativeDrive } from '@jupyter/collaborative-drive';
 import { JupyterGISDocumentWidget } from '@jupytergis/base';
 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 { Contents, ServiceManager } from '@jupyterlab/services';
 import { IStateDB } from '@jupyterlab/statedb';
 import { CommandRegistry } from '@lumino/commands';
 interface IOptions extends DocumentRegistry.IWidgetFactoryOptions {
@@ -18,7 +17,7 @@ interface IOptions extends DocumentRegistry.IWidgetFactoryOptions {
     rendermime?: IRenderMimeRegistry;
     consoleTracker?: IConsoleTracker;
     backendCheck?: () => boolean;
-    drive?: ICollaborativeDrive | null;
+    drive?: Contents.IDrive | null;
     formSchemaRegistry: IJGISFormSchemaRegistry;
     state: IStateDB;
     annotationModel: IAnnotationModel;

package/lib/factory.js

@@ -15,7 +15,7 @@ export class JupyterGISDocumentWidgetFactory extends ABCWidgetFactory {
     constructor(options) {
         var _a;
         const { backendCheck, externalCommandRegistry } = options, rest = __rest(options, ["backendCheck", "externalCommandRegistry"]);
-        super(rest);
+        super(Object.assign(Object.assign({}, rest), { contentProviderId: 'rtc' }));
         this.options = options;
         this._backendCheck = backendCheck;
         this._commands = options.commands;

package/lib/jgisplugin/plugins.js

@@ -1,4 +1,4 @@
-import { ICollaborativeDrive, } from '@jupyter/collaborative-drive';
+import { ICollaborativeContentProvider } from '@jupyter/collaborative-drive';
 import { CommandIDs, logoIcon, logoMiniIcon } from '@jupytergis/base';
 import { IAnnotationToken, IJGISExternalCommandRegistryToken, IJupyterGISDocTracker, JupyterGISDoc, SCHEMA_VERSION, ProcessingMerge, IJGISFormSchemaRegistryToken, } from '@jupytergis/schema';
 import { ICommandPalette, IThemeManager, } from '@jupyterlab/apputils';
@@ -18,7 +18,7 @@ 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, formSchemaRegistry, state, launcher, palette, drive) => {
+const activate = async (app, tracker, themeManager, browserFactory, externalCommandRegistry, contentFactory, editorServices, rendermime, consoleTracker, annotationModel, settingRegistry, formSchemaRegistry, state, launcher, palette, collaborativeContentProvider) => {
     formSchemaRegistry && state;
     if (PageConfig.getOption('jgis_expose_maps')) {
         window.jupytergisMaps = {};
@@ -76,8 +76,8 @@ const activate = async (app, tracker, themeManager, browserFactory, externalComm
     const jGISSharedModelFactory = () => {
         return new JupyterGISDoc();
     };
-    if (drive) {
-        drive.sharedModelFactory.registerDocumentFactory(CONTENT_TYPE, jGISSharedModelFactory);
+    if (collaborativeContentProvider) {
+        collaborativeContentProvider.sharedModelFactory.registerDocumentFactory(CONTENT_TYPE, jGISSharedModelFactory);
     }
     widgetFactory.widgetCreated.connect((sender, widget) => {
         widget.title.icon = logoIcon;
@@ -196,7 +196,7 @@ const jGISPlugin = {
         IJGISFormSchemaRegistryToken,
         IStateDB,
     ],
-    optional: [ILauncher, ICommandPalette, ICollaborativeDrive],
+    optional: [ILauncher, ICommandPalette, ICollaborativeContentProvider],
     autoStart: true,
     activate,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupytergis/jupytergis-core",
-  "version": "0.10.1",
+  "version": "0.12.0",
   "description": "JupyterGIS core extension",
   "keywords": [
     "jupyter",
@@ -53,9 +53,9 @@
     "watch:labextension": "jupyter labextension watch ."
   },
   "dependencies": {
-    "@jupyter/collaborative-drive": "^3.0.0",
-    "@jupytergis/base": "^0.10.1",
-    "@jupytergis/schema": "^0.10.1",
+    "@jupyter/collaborative-drive": "^4.1.2",
+    "@jupytergis/base": "^0.12.0",
+    "@jupytergis/schema": "^0.12.0",
     "@jupyterlab/application": "^4.3.0",
     "@jupyterlab/apputils": "^4.3.0",
     "@jupyterlab/docregistry": "^4.3.0",

package/schema/jupytergis-settings.json

@@ -1,4 +1,5 @@
 {
+  "jupyter.lab.setting-icon": "jupytergis::logoMini",
   "title": "JupyterGIS Settings",
   "description": "Settings for the JupyterGIS extension.",
   "type": "object",
@@ -12,36 +13,61 @@
     "leftPanelDisabled": {
       "type": "boolean",
       "title": "Disable Left Panel",
+      "description": "Disable Left Panel in the JupyterGIS interface.",
+      "default": false
+    },
+    "rightPanelDisabled": {
+      "type": "boolean",
+      "title": "Disable Right Panel",
+      "description": "Disable Right Panel in the JupyterGIS interface.",
+      "default": false
+    },
+    "layersDisabled": {
+      "type": "boolean",
+      "title": "Disable Layers",
+      "description": "Disable Layers tab from the Left Panel.",
       "default": false
     },
     "stacBrowserDisabled": {
       "type": "boolean",
       "title": "Disable STAC Browser",
+      "description": "Disable STAC Browser tab from the Left Panel.",
       "default": false
     },
     "filtersDisabled": {
       "type": "boolean",
       "title": "Disable Filters",
+      "description": "Disable Filters tab from the Left Panel.",
+      "default": false
+    },
+    "objectPropertiesDisabled": {
+      "type": "boolean",
+      "title": "Disable Object Properties",
+      "description": "Disable Object Properties tab from the Right Panel.",
+      "default": false
+    },
+    "storyMapsDisabled": {
+      "type": "boolean",
+      "title": "Disable Story Maps",
+      "description": "Disable Segments tab from the Left Panel and Story Editor tab from the Right Panel.",
       "default": false
     },
     "annotationsDisabled": {
       "type": "boolean",
       "title": "Disable Annotations",
+      "description": "Disable Annotations tab from the Right Panel.",
       "default": false
     },
     "identifyDisabled": {
       "type": "boolean",
       "title": "Disable Identify Features",
+      "description": "Disable Identify Features tab from the Right Panel and Identify command toolbar button.",
       "default": false
     },
-    "objectPropertiesDisabled": {
+    "zoomButtonsEnabled": {
       "type": "boolean",
-      "title": "Disable Object Properties",
-      "default": false
-    },
-    "rightPanelDisabled": {
-      "type": "boolean",
-      "title": "Disable Right Panel",
+      "title": "Enable Zoom Buttons",
+      "description": "Enable + / − zoom buttons on the map.",
       "default": false
     }
   }