@jupytergis/base 0.13.0 → 0.13.1

package/lib/dialogs/symbology/vector_layer/types/Categorized.js

@@ -111,7 +111,7 @@ const Categorized = ({ model, okSignalPromise, layerId, symbologyTab, selectable
             renderType: 'Categorized',
             value: selectedAttributeRef.current,
             colorRamp: (_a = colorRampOptionsRef.current) === null || _a === void 0 ? void 0 : _a.selectedRamp,
-            symbologyTab,
+            method: symbologyTab,
             reverse: reverseRamp,
         };
         saveSymbology({

package/lib/formbuilder/objectform/baseform.d.ts

@@ -68,6 +68,11 @@ export declare class BaseForm extends React.Component<IBaseFormProps, IBaseFormS
     constructor(props: IBaseFormProps);
     componentDidUpdate(prevProps: IBaseFormProps, prevState: IBaseFormStates): void;
     componentDidMount(): void;
+    /**
+     * Fills null/undefined values in data with schema defaults (mutates data).
+     * @returns true if any null/undefined was replaced by a default
+     */
+    protected applySchemaDefaults(data: IDict<any> | undefined, schema: RJSFSchema): boolean;
     protected processSchema(data: IDict<any> | undefined, schema: RJSFSchema, uiSchema: UiSchema): void;
     /**
      * Remove a specific entry from the form. Can be used in subclasses if needed while under processSchema.

package/lib/formbuilder/objectform/baseform.js

@@ -30,10 +30,17 @@ const WrappedFormComponent = props => {
  */
 export class BaseForm extends React.Component {
     constructor(props) {
+        var _a;
         super(props);
         /** Skip syncData for the initial onChange (RJSF populating form), only sync on user edits. */
         this.isInitialLoadRef = true;
         this.currentFormData = deepCopy(this.props.sourceData);
+        if (props.schema) {
+            const applied = this.applySchemaDefaults(this.currentFormData, props.schema);
+            if (applied) {
+                props.syncData((_a = this.currentFormData) !== null && _a !== void 0 ? _a : {});
+            }
+        }
         this.state = {
             schema: props.schema,
             extraErrors: {},
@@ -42,9 +49,16 @@ export class BaseForm extends React.Component {
     componentDidUpdate(prevProps, prevState) {
         if (prevProps.sourceData !== this.props.sourceData) {
             this.currentFormData = deepCopy(this.props.sourceData);
+            // if (this.props.schema) {
+            //   const applied = this.applySchemaDefaults(
+            //     this.currentFormData,
+            //     this.props.schema as RJSFSchema,
+            //   );
+            //   if (applied) {
+            //     this.props.syncData(this.currentFormData ?? {});
+            //   }
             const schema = deepCopy(this.props.schema);
             this.setState(old => (Object.assign(Object.assign({}, old), { schema })));
-            this.isInitialLoadRef = true;
         }
     }
     componentDidMount() {
@@ -53,6 +67,43 @@ export class BaseForm extends React.Component {
             this.setState(old => (Object.assign(Object.assign({}, old), this.state.extraErrors)));
             this.props.formErrorSignal.emit(extraErrors);
         }
+        this.isInitialLoadRef = false;
+    }
+    /**
+     * Fills null/undefined values in data with schema defaults (mutates data).
+     * @returns true if any null/undefined was replaced by a default
+     */
+    applySchemaDefaults(data, schema) {
+        if (!data || !schema.properties) {
+            return false;
+        }
+        let applied = false;
+        const props = schema.properties;
+        for (const [key, propSchema] of Object.entries(props)) {
+            if (propSchema === null ||
+                propSchema === undefined ||
+                typeof propSchema !== 'object') {
+                continue;
+            }
+            const val = data[key];
+            if (val === null || val === undefined) {
+                if ('default' in propSchema &&
+                    propSchema.default !== undefined) {
+                    data[key] = deepCopy(propSchema.default);
+                    applied = true;
+                }
+            }
+            else if (propSchema.type === 'object' &&
+                typeof val === 'object' &&
+                val !== null &&
+                !Array.isArray(val) &&
+                propSchema.properties) {
+                if (this.applySchemaDefaults(val, propSchema)) {
+                    applied = true;
+                }
+            }
+        }
+        return applied;
     }
     processSchema(data, schema, uiSchema) {
         if (!schema['properties']) {

package/lib/formbuilder/objectform/components/SegmentFormSymbology.js

@@ -40,7 +40,7 @@ function LayerOverrideItem({ item, formContext }) {
     return (React.createElement("div", { className: "jGIS-symbology-override-item" },
         React.createElement("div", { style: { flex: 1 } }, item.children),
         React.createElement("div", { style: { display: 'flex', gap: '1rem' } },
-            React.createElement(Button, { title: "Edit symbology override for the target layer", onClick: handleOpenSymbology, style: { width: '100%' }, disabled: !canOpenSymbology },
+            React.createElement(Button, { title: "Edit layer override for the target layer", onClick: handleOpenSymbology, style: { width: '100%' }, disabled: !canOpenSymbology },
                 React.createElement("span", { className: "fa fa-brush", style: { marginRight: '4px' } }),
                 "Edit Symbology"),
             item.hasRemove && (React.createElement(Button, { variant: "destructive", onClick: item.onDropIndexClick(item.index), title: "Remove item" }, "Remove")))));
@@ -55,5 +55,5 @@ export function ArrayFieldTemplate(props) {
                 alignItems: 'center',
             } },
             props.items.map(item => (React.createElement(LayerOverrideItem, { key: item.key, item: item, formContext: props.formContext }))),
-            props.canAdd && (React.createElement(Button, { onClick: props.onAddClick }, "Add Symbology Override")))));
+            props.canAdd && (React.createElement(Button, { onClick: props.onAddClick }, "Add Layer Override")))));
 }

package/lib/formbuilder/objectform/source/geojsonsource.js

@@ -15,9 +15,7 @@ export class GeoJSONSourcePropertiesForm extends PathBasedSourcePropertiesForm {
         this._validatePath((_b = (_a = props.sourceData) === null || _a === void 0 ? void 0 : _a.path) !== null && _b !== void 0 ? _b : '');
     }
     processSchema(data, schema, uiSchema) {
-        if ((data === null || data === void 0 ? void 0 : data.path) !== '') {
-            this.removeFormEntry('data', data, schema, uiSchema);
-        }
+        this.removeFormEntry('data', data, schema, uiSchema);
         if (this.props.formContext === 'create') {
             schema.properties.path.description =
                 'The local path to a GeoJSON file. (If no path/url is provided, an empty GeoJSON is created.)';

package/lib/panelview/story-maps/StoryViewerPanel.js

@@ -28,7 +28,7 @@ const StoryViewerPanel = forwardRef(({ model, isSpecta, isMobile = false, classN
         model.setCurrentSegmentIndex(index);
         setCurrentIndexDisplayed(index);
     }, [model]);
-    /** Layers affected by symbology override
+    /** Layers affected by layer override
      * We want to remove added layers (ie Heatmap)
      * and Restore the original symbology for modified layers
      */
@@ -209,7 +209,7 @@ const StoryViewerPanel = forwardRef(({ model, isSpecta, isMobile = false, classN
             model.sharedModel.awareness.off('change', handleSelectedStorySegmentChange);
         };
     }, [model, storyData, setIndex]);
-    // Apply symbology overrides for the segment at the given index
+    // Apply layer overrides for the segment at the given index
     const overrideSymbology = (index) => {
         var _a;
         if (index < 0 || !storySegments[index]) {
@@ -220,7 +220,7 @@ const StoryViewerPanel = forwardRef(({ model, isSpecta, isMobile = false, classN
         if (!Array.isArray(layerOverrides)) {
             return;
         }
-        // Apply all symbology overrides for this segment
+        // Apply all layer overrides for this segment
         layerOverrides.forEach(override => {
             const { color, opacity, symbologyState, targetLayer: targetLayerId, visible, } = override;
             if (!targetLayerId) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupytergis/base",
-  "version": "0.13.0",
+  "version": "0.13.1",
   "description": "A JupyterLab extension for 3D modelling.",
   "keywords": [
     "jupyter",
@@ -44,7 +44,7 @@
     "@jupyter/collaboration": "^4",
     "@jupyter/react-components": "^0.16.6",
     "@jupyter/ydoc": "^2.0.0 || ^3.0.0",
-    "@jupytergis/schema": "^0.13.0",
+    "@jupytergis/schema": "^0.13.1",
     "@jupyterlab/application": "^4.3.0",
     "@jupyterlab/apputils": "^4.3.0",
     "@jupyterlab/completer": "^4.3.0",