@jupytergis/jupytergis-lab 0.13.2 → 0.14.0

package/lib/index.js

@@ -23,46 +23,42 @@ const plugin = {
             return (tracker.currentWidget !== null &&
                 tracker.currentWidget === app.shell.currentWidget);
         };
-        const LAYER = '.jp-gis-layerItem:not(.jp-gis-layerGroup)';
+        const GIS_ITEM = '.jp-gis-layerItem:not(.jp-gis-layerGroup)';
+        const GIS_LAYER_ITEM = '.jp-gis-layerItem:not(.jp-gis-layerGroup):not(.jp-gis-storySegmentLayer)';
         createDefaultLayerRegistry(layerBrowserRegistry);
         const stateDbManager = GlobalStateDbManager.getInstance();
         stateDbManager.initialize(state);
         addCommands(app, tracker, translator, formSchemaRegistry, layerBrowserRegistry, state, completionProviderManager);
-        app.contextMenu.addItem({
-            selector: '.jp-gis-source.jp-gis-sourceUnused',
-            rank: 1,
-            command: CommandIDs.removeSource,
-        });
-        app.contextMenu.addItem({
-            selector: '.jp-gis-source',
-            rank: 1,
-            command: CommandIDs.renameSource,
-        });
         // LAYERS and LAYER GROUPS context menu
         app.contextMenu.addItem({
             command: CommandIDs.symbology,
-            selector: LAYER,
+            selector: GIS_LAYER_ITEM,
             rank: 1,
         });
         // Separator
         app.contextMenu.addItem({
             type: 'separator',
-            selector: LAYER,
+            selector: GIS_ITEM,
             rank: 1,
         });
         app.contextMenu.addItem({
             command: CommandIDs.removeSelected,
-            selector: LAYER,
+            selector: GIS_ITEM,
             rank: 2,
         });
         app.contextMenu.addItem({
             command: CommandIDs.renameSelected,
-            selector: LAYER,
+            selector: GIS_ITEM,
+            rank: 2,
+        });
+        app.contextMenu.addItem({
+            command: CommandIDs.duplicateSelected,
+            selector: GIS_ITEM,
             rank: 2,
         });
         app.contextMenu.addItem({
             command: CommandIDs.zoomToLayer,
-            selector: LAYER,
+            selector: GIS_ITEM,
             rank: 2,
         });
         // Create the Download submenu
@@ -75,7 +71,7 @@ const plugin = {
         // Add the Download submenu to the context menu
         app.contextMenu.addItem({
             type: 'submenu',
-            selector: LAYER,
+            selector: GIS_LAYER_ITEM,
             rank: 2,
             submenu: downloadSubmenu,
         });
@@ -92,20 +88,20 @@ const plugin = {
         }
         app.contextMenu.addItem({
             type: 'submenu',
-            selector: LAYER,
+            selector: GIS_LAYER_ITEM,
             rank: 2,
             submenu: processingSubmenu,
         });
-        const moveLayerSubmenu = new Menu({ commands: app.commands });
-        moveLayerSubmenu.title.label = translator
+        const moveSelectedSubmenu = new Menu({ commands: app.commands });
+        moveSelectedSubmenu.title.label = translator
             .load('jupyterlab')
-            .__('Move Selected Layers to Group');
-        moveLayerSubmenu.id = 'jp-gis-contextmenu-movelayer';
+            .__('Move Selection to Group');
+        moveSelectedSubmenu.id = 'jp-gis-contextmenu-movelayer';
         app.contextMenu.addItem({
             type: 'submenu',
-            selector: LAYER,
+            selector: GIS_ITEM,
             rank: 2,
-            submenu: moveLayerSubmenu,
+            submenu: moveSelectedSubmenu,
         });
         app.contextMenu.opened.connect(() => buildGroupsMenu(app.contextMenu, tracker));
         app.contextMenu.addItem({
@@ -206,17 +202,17 @@ function buildGroupsMenu(contextMenu, tracker) {
         return result;
     }
     submenu.addItem({
-        command: CommandIDs.moveLayersToGroup,
+        command: CommandIDs.moveSelectedToGroup,
         args: { label: '' },
     });
     groupNames.forEach(name => {
         submenu.addItem({
-            command: CommandIDs.moveLayersToGroup,
+            command: CommandIDs.moveSelectedToGroup,
             args: { label: name },
         });
     });
     submenu.addItem({
-        command: CommandIDs.moveLayerToNewGroup,
+        command: CommandIDs.moveSelectedToNewGroup,
     });
 }
 export default [plugin, notebookRendererPlugin];

package/lib/notebookrenderer.js

@@ -1,5 +1,5 @@
 import { JupyterGISOutputWidget, JupyterGISPanel, ToolbarWidget, } from '@jupytergis/base';
-import { IJGISExternalCommandRegistryToken, IJupyterGISDocTracker, JupyterGISModel, IJGISFormSchemaRegistryToken, IAnnotationToken, } from '@jupytergis/schema';
+import { DEFAULT_JGIS_DOCUMENT_CONTENT, IJGISExternalCommandRegistryToken, IJupyterGISDocTracker, JupyterGISModel, IJGISFormSchemaRegistryToken, IAnnotationToken, } from '@jupytergis/schema';
 import { showErrorMessage } from '@jupyterlab/apputils';
 import { ConsolePanel } from '@jupyterlab/console';
 import { PathExt } from '@jupyterlab/coreutils';
@@ -55,8 +55,8 @@ export class YJupyterGISLuminoWidget extends Panel {
                 args.stateChange.forEach((change) => {
                     var _a;
                     if (change.name === 'path') {
-                        (_a = this.layout) === null || _a === void 0 ? void 0 : _a.removeWidget(this._jgisWidget);
                         this._jgisWidget.dispose();
+                        (_a = this.layout) === null || _a === void 0 ? void 0 : _a.removeWidget(this._jgisWidget);
                         this._buildWidget(options);
                     }
                 });
@@ -110,7 +110,7 @@ export const notebookRendererPlugin = {
                     }
                     catch (e) {
                         await app.serviceManager.contents.save(localPath, {
-                            content: btoa('{}'),
+                            content: btoa(DEFAULT_JGIS_DOCUMENT_CONTENT),
                             format: 'base64',
                         });
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupytergis/jupytergis-lab",
-  "version": "0.13.2",
+  "version": "0.14.0",
   "description": "JupyterGIS Lab extension.",
   "keywords": [
     "jupyter",
@@ -53,8 +53,8 @@
   },
   "dependencies": {
     "@jupyter/collaborative-drive": "^4.1.2",
-    "@jupytergis/base": "^0.13.2",
-    "@jupytergis/schema": "^0.13.2",
+    "@jupytergis/base": "^0.14.0",
+    "@jupytergis/schema": "^0.14.0",
     "@jupyterlab/application": "^4.3.0",
     "@jupyterlab/apputils": "^4.3.0",
     "@jupyterlab/completer": "^4.3.0",

package/style/base.css

@@ -472,15 +472,6 @@ div.jGIS-toolbar-widget > div.jp-Toolbar-item:last-child {
   display: none;
 }
 
-.jGIS-property-panel .rjsf .control-label,
-.jGIS-property-panel .rjsf legend {
-  margin: 0;
-  padding: 0;
-  font-weight: bold;
-  position: relative;
-  width: 100%;
-}
-
 .jGIS-property-panel .rjsf legend > :first-child,
 .jGIS-property-panel .rjsf .control-label > :first-child {
   margin-top: 0;
@@ -507,7 +498,12 @@ div.jGIS-toolbar-widget > div.jp-Toolbar-item:last-child {
   .jp-FormGroup-content
   fieldset
   .jp-inputFieldWrapper
-  > input {
+  > input,
+.jGIS-property-panel
+  .jp-FormGroup-content
+  fieldset
+  .jp-inputFieldWrapper
+  > textarea {
   box-sizing: border-box;
   border: var(--jp-border-width) solid var(--jp-border-color1);
   background-color: var(--jp-layout-color0);