@jupytergis/jupytergis-qgis 0.4.5 → 0.6.0

package/lib/modelfactory.d.ts

@@ -1,6 +1,7 @@
 import { IJupyterGISDoc, JupyterGISModel, IAnnotationModel } from '@jupytergis/schema';
 import { DocumentRegistry } from '@jupyterlab/docregistry';
 import { Contents } from '@jupyterlab/services';
+import { ISettingRegistry } from '@jupyterlab/settingregistry';
 /**
  * A Model factory to create new instances of JupyterGISModel.
  */
@@ -52,11 +53,13 @@ export declare class JupyterGISModelFactoryBase implements DocumentRegistry.IMod
      */
     createNew(options: DocumentRegistry.IModelOptions<IJupyterGISDoc>): JupyterGISModel;
     private _annotationModel;
+    private _settingRegistry;
     private _disposed;
 }
 export declare namespace JupyterGISModelFactoryBase {
     interface IOptions {
         annotationModel: IAnnotationModel;
+        settingRegistry: ISettingRegistry;
     }
 }
 export declare class QGZModelFactory extends JupyterGISModelFactoryBase {

package/lib/modelfactory.js

@@ -1,4 +1,4 @@
-import { JupyterGISModel } from '@jupytergis/schema';
+import { JupyterGISModel, } from '@jupytergis/schema';
 /**
  * A Model factory to create new instances of JupyterGISModel.
  */
@@ -67,7 +67,8 @@ export class JupyterGISModelFactoryBase {
         const model = new JupyterGISModel({
             sharedModel: options.sharedModel,
             languagePreference: options.languagePreference,
-            annotationModel: this._annotationModel
+            annotationModel: this._annotationModel,
+            settingRegistry: this._settingRegistry,
         });
         return model;
     }

package/lib/plugins.js

@@ -1,13 +1,14 @@
-import { ICollaborativeDrive } from '@jupyter/collaborative-drive';
-import { IJGISExternalCommandRegistryToken, JupyterGISDoc, IJupyterGISDocTracker, IAnnotationToken } from '@jupytergis/schema';
-import { Dialog, ICommandPalette, IThemeManager, InputDialog, showDialog, showErrorMessage } from '@jupyterlab/apputils';
+import { ICollaborativeDrive, } from '@jupyter/collaborative-drive';
+import { logoMiniIcon, logoMiniIconQGZ, requestAPI, } from '@jupytergis/base';
+import { JupyterGISDocumentWidgetFactory } from '@jupytergis/jupytergis-core';
+import { IJGISExternalCommandRegistryToken, JupyterGISDoc, IJupyterGISDocTracker, IAnnotationToken, } from '@jupytergis/schema';
+import { Dialog, ICommandPalette, IThemeManager, InputDialog, showDialog, showErrorMessage, } from '@jupyterlab/apputils';
 import { IEditorServices } from '@jupyterlab/codeeditor';
 import { ConsolePanel, IConsoleTracker } from '@jupyterlab/console';
 import { PathExt } from '@jupyterlab/coreutils';
 import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
+import { ISettingRegistry } from '@jupyterlab/settingregistry';
 import { Widget } from '@lumino/widgets';
-import { logoMiniIcon, logoMiniIconQGZ, requestAPI } from '@jupytergis/base';
-import { JupyterGISDocumentWidgetFactory } from '@jupytergis/jupytergis-core';
 import { QGSModelFactory, QGZModelFactory } from './modelfactory';
 /**
  * The command IDs used by the qgis plugin.
@@ -16,10 +17,10 @@ var CommandIDs;
 (function (CommandIDs) {
     CommandIDs.exportQgis = 'jupytergis:export';
 })(CommandIDs || (CommandIDs = {}));
-const activate = async (app, tracker, themeManager, drive, externalCommandRegistry, contentFactory, editorServices, rendermime, consoleTracker, annotationModel, commandPalette) => {
+const activate = async (app, tracker, themeManager, drive, externalCommandRegistry, contentFactory, editorServices, rendermime, consoleTracker, annotationModel, settingRegistry, commandPalette) => {
     const fcCheck = await requestAPI('jupytergis_qgis/backend-check', {
         method: 'POST',
-        body: JSON.stringify({})
+        body: JSON.stringify({}),
     });
     const { installed } = fcCheck;
     const backendCheck = () => {
@@ -41,7 +42,7 @@ const activate = async (app, tracker, themeManager, drive, externalCommandRegist
         contentFactory,
         rendermime,
         mimeTypeService: editorServices.mimeTypeService,
-        consoleTracker
+        consoleTracker,
     });
     const QGZWidgetFactory = new JupyterGISDocumentWidgetFactory({
         name: 'JupyterGIS QGZ Factory',
@@ -56,14 +57,14 @@ const activate = async (app, tracker, themeManager, drive, externalCommandRegist
         contentFactory,
         rendermime,
         mimeTypeService: editorServices.mimeTypeService,
-        consoleTracker
+        consoleTracker,
     });
     // Registering the widget factory
     app.docRegistry.addWidgetFactory(QGSWidgetFactory);
     app.docRegistry.addWidgetFactory(QGZWidgetFactory);
     // Creating and registering the model factory for our custom DocumentModel
-    app.docRegistry.addModelFactory(new QGSModelFactory({ annotationModel }));
-    app.docRegistry.addModelFactory(new QGZModelFactory({ annotationModel }));
+    app.docRegistry.addModelFactory(new QGSModelFactory({ annotationModel, settingRegistry }));
+    app.docRegistry.addModelFactory(new QGZModelFactory({ annotationModel, settingRegistry }));
     // register the filetype
     app.docRegistry.addFileType({
         name: 'QGS',
@@ -72,7 +73,7 @@ const activate = async (app, tracker, themeManager, drive, externalCommandRegist
         extensions: ['.qgs', '.QGS'],
         fileFormat: 'base64',
         contentType: 'QGS',
-        icon: logoMiniIcon
+        icon: logoMiniIcon,
     });
     app.docRegistry.addFileType({
         name: 'QGZ',
@@ -81,7 +82,7 @@ const activate = async (app, tracker, themeManager, drive, externalCommandRegist
         extensions: ['.qgz', '.QGZ'],
         fileFormat: 'base64',
         contentType: 'QGZ',
-        icon: logoMiniIconQGZ
+        icon: logoMiniIconQGZ,
     });
     const QGISSharedModelFactory = () => {
         return new JupyterGISDoc();
@@ -127,7 +128,7 @@ const activate = async (app, tracker, themeManager, drive, externalCommandRegist
                     filepath = (await InputDialog.getText({
                         label: 'File name',
                         placeholder: PathExt.basename(sourcePath, sourceExtension),
-                        title: 'Export the project to QGZ file'
+                        title: 'Export the project to QGZ file',
                     })).value;
                 }
                 if (filepath === null) {
@@ -151,7 +152,7 @@ const activate = async (app, tracker, themeManager, drive, externalCommandRegist
                     layers: model.layers,
                     sources: model.sources,
                     layerTree: model.layerTree.slice().reverse(),
-                    options: model.options
+                    options: model.options,
                 };
                 // Check if the file exists
                 let fileExist = true;
@@ -161,7 +162,7 @@ const activate = async (app, tracker, themeManager, drive, externalCommandRegist
                 if (fileExist) {
                     const overwrite = await showDialog({
                         title: 'Export the project to QGZ file',
-                        body: `The file ${filepath} already exists.\nDo you want to overwrite it ?`
+                        body: `The file ${filepath} already exists.\nDo you want to overwrite it ?`,
                     });
                     if (!overwrite.button.accept) {
                         return;
@@ -171,8 +172,8 @@ const activate = async (app, tracker, themeManager, drive, externalCommandRegist
                     method: 'POST',
                     body: JSON.stringify({
                         path: absolutePath,
-                        virtual_file: virtualFile
-                    })
+                        virtual_file: virtualFile,
+                    }),
                 });
                 if (!response.exported) {
                     showErrorMessage('Export the project to QGZ file', response.logs.errors.length
@@ -186,15 +187,15 @@ const activate = async (app, tracker, themeManager, drive, externalCommandRegist
                     await showDialog({
                         title: 'Export the project to QGZ file',
                         body,
-                        buttons: [Dialog.okButton()]
+                        buttons: [Dialog.okButton()],
                     });
                 }
-            }
+            },
         });
         if (commandPalette) {
             commandPalette.addItem({
                 command: CommandIDs.exportQgis,
-                category: 'JupyterGIS'
+                category: 'JupyterGIS',
             });
         }
     }
@@ -211,9 +212,10 @@ export const qgisplugin = {
         IEditorServices,
         IRenderMimeRegistry,
         IConsoleTracker,
-        IAnnotationToken
+        IAnnotationToken,
+        ISettingRegistry,
     ],
     optional: [ICommandPalette],
     autoStart: true,
-    activate
+    activate,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupytergis/jupytergis-qgis",
-  "version": "0.4.5",
+  "version": "0.6.0",
   "description": "JupyterGIS QGIS extension.",
   "keywords": [
     "jupyter",
@@ -54,9 +54,9 @@
   },
   "dependencies": {
     "@jupyter/collaborative-drive": "^3.0.0",
-    "@jupytergis/base": "^0.4.5",
-    "@jupytergis/jupytergis-core": "^0.4.5",
-    "@jupytergis/schema": "^0.4.5",
+    "@jupytergis/base": "^0.6.0",
+    "@jupytergis/jupytergis-core": "^0.6.0",
+    "@jupytergis/schema": "^0.6.0",
     "@jupyterlab/application": "^4.3.0",
     "@jupyterlab/apputils": "^4.3.0",
     "@jupyterlab/coreutils": "^6.3.0",