@jupytergis/jupytergis-lab 0.6.2 → 0.7.0

package/lib/index.js

@@ -1,13 +1,11 @@
-import { CommandIDs, ControlPanelModel, GlobalStateDbManager, LeftPanelWidget, RightPanelWidget, addCommands, createDefaultLayerRegistry, logoMiniIcon, rasterSubMenu, vectorSubMenu, } from '@jupytergis/base';
-import { IAnnotationToken, IJGISFormSchemaRegistryToken, IJGISLayerBrowserRegistryToken, IJupyterGISDocTracker, ProcessingMerge, } from '@jupytergis/schema';
-import { ILayoutRestorer, } from '@jupyterlab/application';
+import { CommandIDs, GlobalStateDbManager, addCommands, createDefaultLayerRegistry, rasterSubMenu, vectorSubMenu, } from '@jupytergis/base';
+import { IJGISFormSchemaRegistryToken, IJGISLayerBrowserRegistryToken, IJupyterGISDocTracker, ProcessingMerge, } from '@jupytergis/schema';
 import { ICompletionProviderManager } from '@jupyterlab/completer';
 import { IMainMenu } from '@jupyterlab/mainmenu';
 import { IStateDB } from '@jupyterlab/statedb';
 import { ITranslator, nullTranslator } from '@jupyterlab/translation';
 import { Menu } from '@lumino/widgets';
 import { notebookRendererPlugin } from './notebookrenderer';
-const NAME_SPACE = 'jupytergis';
 const plugin = {
     id: 'jupytergis:lab:main-menu',
     autoStart: true,
@@ -147,44 +145,6 @@ const plugin = {
         }
     },
 };
-const controlPanel = {
-    id: 'jupytergis:lab:controlpanel',
-    autoStart: true,
-    requires: [
-        ILayoutRestorer,
-        IJupyterGISDocTracker,
-        IJGISFormSchemaRegistryToken,
-        IStateDB,
-        IAnnotationToken,
-    ],
-    activate: (app, restorer, tracker, formSchemaRegistry, state, annotationModel) => {
-        const controlModel = new ControlPanelModel({ tracker });
-        const leftControlPanel = new LeftPanelWidget({
-            model: controlModel,
-            tracker,
-            state,
-            commands: app.commands,
-        });
-        leftControlPanel.id = 'jupytergis::leftControlPanel';
-        leftControlPanel.title.caption = 'JupyterGIS Control Panel';
-        leftControlPanel.title.icon = logoMiniIcon;
-        const rightControlPanel = new RightPanelWidget({
-            model: controlModel,
-            tracker,
-            formSchemaRegistry,
-            annotationModel,
-        });
-        rightControlPanel.id = 'jupytergis::rightControlPanel';
-        rightControlPanel.title.caption = 'JupyterGIS Control Panel';
-        rightControlPanel.title.icon = logoMiniIcon;
-        if (restorer) {
-            restorer.add(leftControlPanel, `${NAME_SPACE}-left`);
-            restorer.add(rightControlPanel, `${NAME_SPACE}-right`);
-        }
-        app.shell.add(leftControlPanel, 'left', { rank: 2000 });
-        app.shell.add(rightControlPanel, 'right', { rank: 2000 });
-    },
-};
 /**
  * Populates the application menus for the notebook.
  */
@@ -253,4 +213,4 @@ function buildGroupsMenu(contextMenu, tracker) {
         command: CommandIDs.moveLayerToNewGroup,
     });
 }
-export default [plugin, controlPanel, notebookRendererPlugin];
+export default [plugin, notebookRendererPlugin];

package/lib/notebookrenderer.d.ts

@@ -1,6 +1,7 @@
 import { JupyterGISOutputWidget, JupyterGISTracker } from '@jupytergis/base';
-import { IJGISExternalCommandRegistry, JupyterGISModel } from '@jupytergis/schema';
+import { IJGISExternalCommandRegistry, JupyterGISModel, IJGISFormSchemaRegistry, IAnnotationModel } from '@jupytergis/schema';
 import { JupyterFrontEndPlugin } from '@jupyterlab/application';
+import { IStateDB } from '@jupyterlab/statedb';
 import { CommandRegistry } from '@lumino/commands';
 import { Panel } from '@lumino/widgets';
 import { JupyterYModel } from 'yjs-widgets';
@@ -30,6 +31,9 @@ interface IOptions {
     model: JupyterGISModel;
     externalCommands?: IJGISExternalCommandRegistry;
     tracker?: JupyterGISTracker;
+    formSchemaRegistry?: IJGISFormSchemaRegistry;
+    state?: IStateDB;
+    annotationModel?: IAnnotationModel;
 }
 export declare const notebookRendererPlugin: JupyterFrontEndPlugin<void>;
 export {};

package/lib/notebookrenderer.js

@@ -1,10 +1,11 @@
 import { ICollaborativeDrive } from '@jupyter/collaborative-drive';
 import { JupyterGISOutputWidget, JupyterGISPanel, ToolbarWidget, } from '@jupytergis/base';
-import { IJGISExternalCommandRegistryToken, IJupyterGISDocTracker, JupyterGISModel, } from '@jupytergis/schema';
+import { IJGISExternalCommandRegistryToken, IJupyterGISDocTracker, JupyterGISModel, IJGISFormSchemaRegistryToken, IAnnotationToken, } from '@jupytergis/schema';
 import { showErrorMessage } from '@jupyterlab/apputils';
 import { ConsolePanel } from '@jupyterlab/console';
 import { PathExt } from '@jupyterlab/coreutils';
 import { NotebookPanel } from '@jupyterlab/notebook';
+import { IStateDB } from '@jupyterlab/statedb';
 import { MessageLoop } from '@lumino/messaging';
 import { Panel, Widget } from '@lumino/widgets';
 import { IJupyterYWidgetManager, JupyterYDoc, JupyterYModel, } from 'yjs-widgets';
@@ -19,8 +20,14 @@ export class YJupyterGISLuminoWidget extends Panel {
          * @param options
          */
         this._buildWidget = (options) => {
-            const { commands, model, externalCommands, tracker } = options;
-            const content = new JupyterGISPanel({ model, commandRegistry: commands });
+            const { commands, model, externalCommands, tracker, formSchemaRegistry, state, annotationModel, } = options;
+            const content = new JupyterGISPanel({
+                model,
+                commandRegistry: commands,
+                formSchemaRegistry,
+                state,
+                annotationModel,
+            });
             let toolbar = undefined;
             if (model.filePath) {
                 toolbar = new ToolbarWidget({
@@ -68,8 +75,11 @@ export const notebookRendererPlugin = {
         IJupyterGISDocTracker,
         IJupyterYWidgetManager,
         ICollaborativeDrive,
+        IStateDB,
+        IJGISFormSchemaRegistryToken,
+        IAnnotationToken,
     ],
-    activate: (app, externalCommandRegistry, jgisTracker, yWidgetManager, drive) => {
+    activate: (app, externalCommandRegistry, jgisTracker, yWidgetManager, drive, formSchemaRegistry, state, annotationModel) => {
         if (!yWidgetManager) {
             console.error('Missing IJupyterYWidgetManager token!');
             return;
@@ -131,6 +141,9 @@ export const notebookRendererPlugin = {
                     model: yModel.jupyterGISModel,
                     externalCommands: externalCommandRegistry,
                     tracker: jgisTracker,
+                    annotationModel,
+                    state,
+                    formSchemaRegistry,
                 });
                 this._jgisWidget = widget.jgisWidget;
                 MessageLoop.sendMessage(widget, Widget.Msg.BeforeAttach);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupytergis/jupytergis-lab",
-  "version": "0.6.2",
+  "version": "0.7.0",
   "description": "JupyterGIS Lab extension.",
   "keywords": [
     "jupyter",
@@ -53,8 +53,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/completer": "^4.3.0",