@jupytergis/base 0.5.0 → 0.6.0

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

@@ -1,7 +1,7 @@
 import colormap from 'colormap';
 import React, { useEffect, useRef, useState } from 'react';
-import CanvasSelectComponent from '../../components/color_ramp/CanvasSelectComponent';
-const Heatmap = ({ model, state, okSignalPromise, cancel, layerId }) => {
+import CanvasSelectComponent from "../../components/color_ramp/CanvasSelectComponent";
+const Heatmap = ({ model, state, okSignalPromise, cancel, layerId, }) => {
     if (!layerId) {
         return;
     }
@@ -12,12 +12,12 @@ const Heatmap = ({ model, state, okSignalPromise, cancel, layerId }) => {
     const [selectedRamp, setSelectedRamp] = useState('');
     const [heatmapOptions, setHetamapOptions] = useState({
         radius: 8,
-        blur: 15
+        blur: 15,
     });
     const selectedRampRef = useRef('cool');
     const heatmapOptionsRef = useRef({
         radius: 8,
-        blur: 15
+        blur: 15,
     });
     useEffect(() => {
         populateOptions();
@@ -49,11 +49,11 @@ const Heatmap = ({ model, state, okSignalPromise, cancel, layerId }) => {
         const colorMap = colormap({
             colormap: selectedRampRef.current,
             nshades: 9,
-            format: 'hex'
+            format: 'hex',
         });
         const symbologyState = {
             renderType: 'Heatmap',
-            colorRamp: selectedRampRef.current
+            colorRamp: selectedRampRef.current,
         };
         layer.parameters.symbologyState = symbologyState;
         layer.parameters.color = colorMap;
@@ -64,6 +64,7 @@ const Heatmap = ({ model, state, okSignalPromise, cancel, layerId }) => {
         cancel();
     };
     return (React.createElement("div", { className: "jp-gis-layer-symbology-container" },
+        React.createElement("p", null, "Represent features based on their density using a heatmap."),
         React.createElement("div", { className: "jp-gis-symbology-row jp-gis-heatmap" },
             React.createElement("label", { htmlFor: "color-ramp-select" }, "Color Ramp:"),
             React.createElement(CanvasSelectComponent, { selectedRamp: selectedRamp, setSelected: setSelectedRamp })),

package/lib/dialogs/symbology/vector_layer/types/SimpleSymbol.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
-import { ISymbologyDialogProps } from '../../symbologyDialog';
-declare const SimpleSymbol: ({ model, state, okSignalPromise, cancel, layerId }: ISymbologyDialogProps) => React.JSX.Element | undefined;
+import { ISymbologyTabbedDialogProps } from "../../symbologyDialog";
+declare const SimpleSymbol: React.FC<ISymbologyTabbedDialogProps>;
 export default SimpleSymbol;

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

@@ -1,15 +1,14 @@
 import React, { useEffect, useRef, useState } from 'react';
-import { parseColor } from '../../../../tools';
-const SimpleSymbol = ({ model, state, okSignalPromise, cancel, layerId }) => {
+import { parseColor } from "../../../../tools";
+const SimpleSymbol = ({ model, state, okSignalPromise, cancel, layerId, symbologyTab, }) => {
     const styleRef = useRef();
-    const [useCircleStuff, setUseCircleStuff] = useState(false);
     const [style, setStyle] = useState({
         fillColor: '#3399CC',
         joinStyle: 'round',
         strokeColor: '#3399CC',
         capStyle: 'round',
         strokeWidth: 1.25,
-        radius: 5
+        radius: 5,
     });
     const joinStyleOptions = ['bevel', 'round', 'miter'];
     const capStyleOptions = ['butt', 'round', 'square'];
@@ -24,10 +23,6 @@ const SimpleSymbol = ({ model, state, okSignalPromise, cancel, layerId }) => {
         if (!layer.parameters) {
             return;
         }
-        setUseCircleStuff(layer.parameters.type === 'circle');
-        // Mimicking QGIS here,
-        // Read values from file if we chose them using the single symbol thing
-        // but if we're switching to simple symbol, use defaults
         const initStyle = async () => {
             var _a;
             if (!layer.parameters) {
@@ -35,8 +30,8 @@ const SimpleSymbol = ({ model, state, okSignalPromise, cancel, layerId }) => {
             }
             const renderType = (_a = layer.parameters) === null || _a === void 0 ? void 0 : _a.symbologyState.renderType;
             if (renderType === 'Single Symbol') {
-                // Read from current color or use defaults
-                const parsedStyle = parseColor(layer.parameters.type, layer.parameters.color);
+                // Parse with fallback logic inside
+                const parsedStyle = parseColor(layer.parameters.color);
                 if (parsedStyle) {
                     setStyle(parsedStyle);
                 }
@@ -56,33 +51,35 @@ const SimpleSymbol = ({ model, state, okSignalPromise, cancel, layerId }) => {
         styleRef.current = style;
     }, [style]);
     const handleOk = () => {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         if (!layer.parameters) {
             return;
         }
-        const styleExpr = {};
-        const prefix = layer.parameters.type === 'circle' ? 'circle-' : '';
-        if (layer.parameters.type === 'circle') {
-            styleExpr['circle-radius'] = (_a = styleRef.current) === null || _a === void 0 ? void 0 : _a.radius;
-        }
-        styleExpr[`${prefix}fill-color`] = (_b = styleRef.current) === null || _b === void 0 ? void 0 : _b.fillColor;
-        styleExpr[`${prefix}stroke-color`] = (_c = styleRef.current) === null || _c === void 0 ? void 0 : _c.strokeColor;
-        styleExpr[`${prefix}stroke-width`] = (_d = styleRef.current) === null || _d === void 0 ? void 0 : _d.strokeWidth;
-        styleExpr[`${prefix}stroke-line-join`] = (_e = styleRef.current) === null || _e === void 0 ? void 0 : _e.joinStyle;
-        styleExpr[`${prefix}stroke-line-cap`] = (_f = styleRef.current) === null || _f === void 0 ? void 0 : _f.capStyle;
+        const styleExpr = {
+            'circle-radius': (_a = styleRef.current) === null || _a === void 0 ? void 0 : _a.radius,
+            'circle-fill-color': (_b = styleRef.current) === null || _b === void 0 ? void 0 : _b.fillColor,
+            'circle-stroke-color': (_c = styleRef.current) === null || _c === void 0 ? void 0 : _c.strokeColor,
+            'circle-stroke-width': (_d = styleRef.current) === null || _d === void 0 ? void 0 : _d.strokeWidth,
+            'circle-stroke-line-join': (_e = styleRef.current) === null || _e === void 0 ? void 0 : _e.joinStyle,
+            'circle-stroke-line-cap': (_f = styleRef.current) === null || _f === void 0 ? void 0 : _f.capStyle,
+            'fill-color': (_g = styleRef.current) === null || _g === void 0 ? void 0 : _g.fillColor,
+            'stroke-color': (_h = styleRef.current) === null || _h === void 0 ? void 0 : _h.strokeColor,
+            'stroke-width': (_j = styleRef.current) === null || _j === void 0 ? void 0 : _j.strokeWidth,
+            'stroke-line-join': (_k = styleRef.current) === null || _k === void 0 ? void 0 : _k.joinStyle,
+            'stroke-line-cap': (_l = styleRef.current) === null || _l === void 0 ? void 0 : _l.capStyle,
+        };
         const symbologyState = {
-            renderType: 'Single Symbol'
+            renderType: 'Single Symbol',
         };
         layer.parameters.symbologyState = symbologyState;
         layer.parameters.color = styleExpr;
-        layer.type = 'VectorLayer';
+        if (layer.type === 'HeatmapLayer') {
+            layer.type = 'VectorLayer';
+        }
         model.sharedModel.updateLayer(layerId, layer);
         cancel();
     };
-    return (React.createElement("div", { className: "jp-gis-layer-symbology-container" },
-        useCircleStuff ? (React.createElement("div", { className: "jp-gis-symbology-row" },
-            React.createElement("label", { htmlFor: 'vector-value-select' }, "Radius:"),
-            React.createElement("input", { type: "number", value: style.radius, className: "jp-mod-styled", onChange: event => setStyle(prevState => (Object.assign(Object.assign({}, prevState), { radius: +event.target.value }))) }))) : null,
+    const renderColorTab = () => (React.createElement(React.Fragment, null,
         React.createElement("div", { className: "jp-gis-symbology-row" },
             React.createElement("label", { htmlFor: 'vector-value-select' }, "Fill Color:"),
             React.createElement("input", { type: "color", value: style.fillColor, className: "jp-mod-styled", onChange: event => setStyle(prevState => (Object.assign(Object.assign({}, prevState), { fillColor: event.target.value }))) })),
@@ -95,10 +92,16 @@ const SimpleSymbol = ({ model, state, okSignalPromise, cancel, layerId }) => {
         React.createElement("div", { className: "jp-gis-symbology-row" },
             React.createElement("label", { htmlFor: 'vector-join-select' }, "Join Style:"),
             React.createElement("div", { className: "jp-select-wrapper" },
-                React.createElement("select", { name: 'vector-join-select', onChange: event => setStyle(prevState => (Object.assign(Object.assign({}, prevState), { joinStyle: event.target.value }))), className: "jp-mod-styled" }, joinStyleOptions.map((method, index) => (React.createElement("option", { key: index, value: method, selected: method === style.joinStyle, className: "jp-mod-styled" }, method)))))),
-        useCircleStuff ? (React.createElement("div", { className: "jp-gis-symbology-row" },
+                React.createElement("select", { name: 'vector-join-select', onChange: event => setStyle(prevState => (Object.assign(Object.assign({}, prevState), { joinStyle: event.target.value }))), className: "jp-mod-styled", value: style.joinStyle }, joinStyleOptions.map((method, index) => (React.createElement("option", { key: index, value: method, className: "jp-mod-styled" }, method)))))),
+        React.createElement("div", { className: "jp-gis-symbology-row" },
             React.createElement("label", { htmlFor: 'vector-cap-select' }, "Cap Style:"),
             React.createElement("div", { className: "jp-select-wrapper" },
-                React.createElement("select", { name: 'vector-cap-select', onChange: event => setStyle(prevState => (Object.assign(Object.assign({}, prevState), { capStyle: event.target.value }))), className: "jp-mod-styled" }, capStyleOptions.map((cap, index) => (React.createElement("option", { key: index, value: cap, selected: cap === style.capStyle, className: "jp-mod-styled" }, cap))))))) : null));
+                React.createElement("select", { name: 'vector-cap-select', onChange: event => setStyle(prevState => (Object.assign(Object.assign({}, prevState), { capStyle: event.target.value }))), className: "jp-mod-styled", value: style.capStyle }, capStyleOptions.map((cap, index) => (React.createElement("option", { key: index, value: cap, className: "jp-mod-styled" }, cap))))))));
+    const renderRadiusTab = () => (React.createElement("div", { className: "jp-gis-symbology-row" },
+        React.createElement("label", null, "Radius:"),
+        React.createElement("input", { type: "number", value: style.radius, className: "jp-mod-styled", onChange: e => setStyle(prev => (Object.assign(Object.assign({}, prev), { radius: +e.target.value }))) })));
+    return (React.createElement("div", { className: "jp-gis-layer-symbology-container" },
+        React.createElement("p", null, "Color all features the same way."),
+        symbologyTab === 'color' ? renderColorTab() : renderRadiusTab()));
 };
 export default SimpleSymbol;

package/lib/formbuilder/creationform.js

@@ -9,10 +9,10 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-import { deepCopy } from '../tools';
 import { PromiseDelegate, UUID } from '@lumino/coreutils';
 import { Signal } from '@lumino/signaling';
 import * as React from 'react';
+import { deepCopy } from "../tools";
 import { getLayerTypeForm, getSourceTypeForm } from './formselectors';
 /**
  * Form for creating a source, a layer or both at the same time
@@ -83,7 +83,7 @@ export class CreationForm extends React.Component {
                 const sourceModel = {
                     type: this.props.sourceType || 'RasterSource',
                     name: actualName,
-                    parameters: sourceData
+                    parameters: sourceData,
                 };
                 this.jGISModel.sharedModel.addSource(sourceId, sourceModel);
             }
@@ -97,7 +97,7 @@ export class CreationForm extends React.Component {
                     type: this.props.layerType || 'RasterLayer',
                     parameters: layerData,
                     visible: true,
-                    name: actualName
+                    name: actualName,
                 };
                 this.jGISModel.addLayer(UUID.uuid4(), layerModel);
             }

package/lib/formbuilder/editform.js

@@ -1,6 +1,6 @@
 import { Signal } from '@lumino/signaling';
 import * as React from 'react';
-import { deepCopy } from '../tools';
+import { deepCopy } from "../tools";
 import { getLayerTypeForm, getSourceTypeForm } from './formselectors';
 /**
  * Form for editing a source, a layer or both at the same time
@@ -53,12 +53,12 @@ export class EditForm extends React.Component {
         return (React.createElement("div", null,
             this.props.layer && LayerForm && (React.createElement("div", null,
                 React.createElement("h3", { style: { paddingLeft: '5px' } }, "Layer Properties"),
-                React.createElement(LayerForm, { formContext: "create", sourceType: (source === null || source === void 0 ? void 0 : source.type) || 'RasterSource', model: this.props.model, filePath: this.props.model.filePath, schema: layerSchema, sourceData: layerData, syncData: (properties) => {
+                React.createElement(LayerForm, { formContext: "update", sourceType: (source === null || source === void 0 ? void 0 : source.type) || 'RasterSource', model: this.props.model, filePath: this.props.model.filePath, schema: layerSchema, sourceData: layerData, syncData: (properties) => {
                         this.syncObjectProperties(this.props.layer, properties);
                     } }))),
             this.props.source && SourceForm && (React.createElement("div", null,
                 React.createElement("h3", { style: { paddingLeft: '5px' } }, "Source Properties"),
-                React.createElement(SourceForm, { formContext: "create", model: this.props.model, filePath: this.props.model.filePath, schema: sourceSchema, sourceData: sourceData, syncData: (properties) => {
+                React.createElement(SourceForm, { formContext: "update", model: this.props.model, filePath: this.props.model.filePath, schema: sourceSchema, sourceData: sourceData, syncData: (properties) => {
                         this.syncObjectProperties(this.props.source, properties);
                     }, formChangedSignal: this.sourceFormChangedSignal, sourceType: (source === null || source === void 0 ? void 0 : source.type) || 'RasterSource' })))));
     }

package/lib/formbuilder/formselectors.d.ts

@@ -1,5 +1,5 @@
 import { LayerType, SourceType } from '@jupytergis/schema';
-import { SourcePropertiesForm } from './objectform/source';
 import { LayerPropertiesForm } from './objectform/layer';
+import { SourcePropertiesForm } from './objectform/source';
 export declare function getLayerTypeForm(layerType: LayerType): typeof LayerPropertiesForm;
 export declare function getSourceTypeForm(sourceType: SourceType): typeof SourcePropertiesForm;

package/lib/formbuilder/formselectors.js

@@ -1,5 +1,5 @@
-import { GeoJSONSourcePropertiesForm, GeoTiffSourcePropertiesForm, PathBasedSourcePropertiesForm, TileSourcePropertiesForm, SourcePropertiesForm } from './objectform/source';
-import { HeatmapLayerPropertiesForm, HillshadeLayerPropertiesForm, LayerPropertiesForm, VectorLayerPropertiesForm, WebGlLayerPropertiesForm } from './objectform/layer';
+import { HeatmapLayerPropertiesForm, HillshadeLayerPropertiesForm, LayerPropertiesForm, VectorLayerPropertiesForm, WebGlLayerPropertiesForm, } from './objectform/layer';
+import { GeoJSONSourcePropertiesForm, GeoTiffSourcePropertiesForm, PathBasedSourcePropertiesForm, TileSourcePropertiesForm, SourcePropertiesForm, } from './objectform/source';
 export function getLayerTypeForm(layerType) {
     let LayerForm = LayerPropertiesForm;
     switch (layerType) {

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

@@ -2,10 +2,11 @@ import { IJupyterGISModel } from '@jupytergis/schema';
 import { Dialog } from '@jupyterlab/apputils';
 import { Signal } from '@lumino/signaling';
 import { IChangeEvent, ISubmitEvent } from '@rjsf/core';
+import { RJSFSchema, UiSchema } from '@rjsf/utils';
 import * as React from 'react';
-import { IDict } from '../../types';
+import { IDict } from "../../types";
 export interface IBaseFormStates {
-    schema?: IDict;
+    schema?: RJSFSchema;
     extraErrors?: any;
 }
 export interface IBaseFormProps {
@@ -61,7 +62,7 @@ export declare class BaseForm extends React.Component<IBaseFormProps, IBaseFormS
     constructor(props: IBaseFormProps);
     componentDidUpdate(prevProps: IBaseFormProps, prevState: IBaseFormStates): void;
     componentDidMount(): void;
-    protected processSchema(data: IDict<any> | undefined, schema: IDict, uiSchema: IDict): void;
+    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.
      * @param entry The entry name
@@ -69,7 +70,7 @@ export declare class BaseForm extends React.Component<IBaseFormProps, IBaseFormS
      * @param schema The form schema
      * @param uiSchema The form uiSchema
      */
-    protected removeFormEntry(entry: string, data: IDict<any> | undefined, schema: IDict, uiSchema: IDict): void;
+    protected removeFormEntry(entry: string, data: IDict<any> | undefined, schema: RJSFSchema, uiSchema: UiSchema): void;
     protected syncData(properties: IDict<any> | undefined): void;
     protected onFormChange(e: IChangeEvent): void;
     protected onFormBlur(id: string, value: any): void;

package/lib/formbuilder/objectform/baseform.js

@@ -13,8 +13,8 @@ import { Slider } from '@jupyter/react-components';
 import { FormComponent } from '@jupyterlab/ui-components';
 import validatorAjv8 from '@rjsf/validator-ajv8';
 import * as React from 'react';
-import { deepCopy } from '../../tools';
-const WrappedFormComponent = (props) => {
+import { deepCopy } from "../../tools";
+const WrappedFormComponent = props => {
     const { fields } = props, rest = __rest(props, ["fields"]);
     return (React.createElement(FormComponent, Object.assign({}, rest, { validator: validatorAjv8, fields: Object.assign({}, fields) })));
 };
@@ -29,7 +29,7 @@ export class BaseForm extends React.Component {
         this.currentFormData = deepCopy(this.props.sourceData);
         this.state = {
             schema: props.schema,
-            extraErrors: {}
+            extraErrors: {},
         };
     }
     componentDidUpdate(prevProps, prevState) {
@@ -57,13 +57,13 @@ export class BaseForm extends React.Component {
                 uiSchema[k] = Object.assign({ 'ui:options': {
                         orderable: false,
                         removable: false,
-                        addable: false
+                        addable: false,
                     } }, uiSchema[k]);
                 if (v['items']['type'] === 'array') {
                     uiSchema[k] = Object.assign({ items: Object.assign({ 'ui:options': {
                                 orderable: false,
                                 removable: false,
-                                addable: false
+                                addable: false,
                             } }, uiSchema[k]['items']) }, uiSchema[k]);
                 }
             }
@@ -103,9 +103,9 @@ export class BaseForm extends React.Component {
                                     border: '1px solid #ccc',
                                     borderRadius: '4px',
                                     padding: '4px',
-                                    marginBottom: '5px'
+                                    marginBottom: '5px',
                                 } })));
-                    }
+                    },
                 };
             }
             // Don't show readOnly properties when it's a form for updating an object
@@ -130,7 +130,9 @@ export class BaseForm extends React.Component {
         if (data) {
             delete data[entry];
         }
-        delete schema.properties[entry];
+        if (schema.properties) {
+            delete schema.properties[entry];
+        }
         delete uiSchema[entry];
         if (schema.required && schema.required.includes(entry)) {
             schema.required.splice(schema.required.indexOf(entry), 1);
@@ -151,6 +153,9 @@ export class BaseForm extends React.Component {
             const extraErrors = Object.keys(this.state.extraErrors).length > 0;
             this.props.formErrorSignal.emit(extraErrors);
         }
+        if (this.props.formContext === 'update') {
+            this.syncData(this.currentFormData);
+        }
     }
     onFormBlur(id, value) {
         // This is a no-op here
@@ -168,8 +173,8 @@ export class BaseForm extends React.Component {
             const uiSchema = {
                 additionalProperties: {
                     'ui:label': false,
-                    classNames: 'jGIS-hidden-field'
-                }
+                    classNames: 'jGIS-hidden-field',
+                },
             };
             this.processSchema(formData, schema, uiSchema);
             const submitRef = React.createRef();
@@ -186,10 +191,7 @@ export class BaseForm extends React.Component {
                             (_a = submitRef.current) === null || _a === void 0 ? void 0 : _a.click();
                         }
                     } },
-                    React.createElement(WrappedFormComponent, { schema: schema, uiSchema: uiSchema, formData: formData, onSubmit: this.onFormSubmit.bind(this), onChange: this.onFormChange.bind(this), onBlur: this.onFormBlur.bind(this), ok: this.props.ok, cancel: this.props.cancel, liveValidate: true, children: React.createElement("button", { ref: submitRef, type: "submit", style: { display: 'none' } }), extraErrors: this.state.extraErrors })),
-                !this.props.ok && (React.createElement("div", { className: "jGIS-property-buttons" },
-                    React.createElement("button", { className: "jp-Dialog-button jp-mod-accept jp-mod-styled", onClick: () => { var _a; return (_a = submitRef.current) === null || _a === void 0 ? void 0 : _a.click(); } },
-                        React.createElement("div", { className: "jp-Dialog-buttonLabel" }, "Ok"))))));
+                    React.createElement(WrappedFormComponent, { schema: schema, uiSchema: uiSchema, formData: formData, onSubmit: this.onFormSubmit.bind(this), onChange: this.onFormChange.bind(this), onBlur: this.onFormBlur.bind(this), ok: this.props.ok, cancel: this.props.cancel, liveValidate: true, children: React.createElement("button", { ref: submitRef, type: "submit", style: { display: 'none' } }), extraErrors: this.state.extraErrors }))));
         }
     }
 }

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

@@ -1,2 +1,2 @@
 import React from 'react';
-export declare const FileSelectorWidget: (props: any) => React.JSX.Element;
+export declare const FileSelectorWidget: React.FC<any>;

package/lib/formbuilder/objectform/fileselectorwidget.js

@@ -1,9 +1,9 @@
-import React, { useState, useEffect, useRef } from 'react';
-import { FileDialog } from '@jupyterlab/filebrowser';
 import { Dialog } from '@jupyterlab/apputils';
-import { LayerCreationFormDialog } from '../../dialogs/layerCreationFormDialog';
 import { PathExt } from '@jupyterlab/coreutils';
-export const FileSelectorWidget = (props) => {
+import { FileDialog } from '@jupyterlab/filebrowser';
+import React, { useState, useEffect, useRef } from 'react';
+import { LayerCreationFormDialog } from "../../dialogs/layerCreationFormDialog";
+export const FileSelectorWidget = props => {
     const { options } = props;
     const { docManager, formOptions } = options;
     const [serverFilePath, setServerFilePath] = useState('');
@@ -36,7 +36,7 @@ export const FileSelectorWidget = (props) => {
             }
             const output = await FileDialog.getOpenFiles({
                 title: `Select ${formOptions.sourceType.split('Source')[0]} File`,
-                manager: docManager
+                manager: docManager,
             });
             if (output.value && output.value.length > 0) {
                 const selectedFilePath = output.value[0].path;

package/lib/formbuilder/objectform/layer/heatmapLayerForm.js

@@ -1,4 +1,4 @@
-import { loadFile } from '../../../tools';
+import { loadFile } from "../../../tools";
 import { LayerPropertiesForm } from './layerform';
 export class HeatmapLayerPropertiesForm extends LayerPropertiesForm {
     constructor(props) {
@@ -51,7 +51,7 @@ export class HeatmapLayerPropertiesForm extends LayerPropertiesForm {
         const jsonData = await loadFile({
             filepath: source.parameters.path,
             type: 'GeoJSONSource',
-            model: this.props.model
+            model: this.props.model,
         });
         const featureProps = jsonData.features[0].properties;
         this.features = Object.keys(featureProps);

package/lib/formbuilder/objectform/layer/hillshadeLayerForm.js

@@ -6,7 +6,7 @@ export class HillshadeLayerPropertiesForm extends LayerPropertiesForm {
     processSchema(data, schema, uiSchema) {
         super.processSchema(data, schema, uiSchema);
         uiSchema['shadowColor'] = {
-            'ui:widget': 'color'
+            'ui:widget': 'color',
         };
     }
 }

package/lib/formbuilder/objectform/layer/layerform.d.ts

@@ -1,7 +1,7 @@
 import { IDict, SourceType } from '@jupytergis/schema';
-import { BaseForm, IBaseFormProps } from '../baseform';
 import { Signal } from '@lumino/signaling';
 import { IChangeEvent } from '@rjsf/core';
+import { BaseForm, IBaseFormProps } from "../baseform";
 export interface ILayerProps extends IBaseFormProps {
     /**
      * The source type for the layer

package/lib/formbuilder/objectform/layer/layerform.js

@@ -1,12 +1,13 @@
-import { BaseForm } from '../baseform';
+import { BaseForm, } from "../baseform";
 export class LayerPropertiesForm extends BaseForm {
     constructor(props) {
         super(props);
         this.sourceFormChangedSignal = props.sourceFormChangedSignal;
     }
     processSchema(data, schema, uiSchema) {
+        var _a;
         super.processSchema(data, schema, uiSchema);
-        if (!schema.properties.source) {
+        if (!((_a = schema.properties) === null || _a === void 0 ? void 0 : _a.source)) {
             return;
         }
         // Replace the source text box by a dropdown menu

package/lib/formbuilder/objectform/process/dissolveProcessForm.d.ts

@@ -1,6 +1,6 @@
-import { BaseForm, IBaseFormProps } from '../baseform';
 import { IDict, IJupyterGISModel } from '@jupytergis/schema';
 import { IChangeEvent } from '@rjsf/core';
+import { BaseForm, IBaseFormProps } from "../baseform";
 interface IDissolveFormOptions extends IBaseFormProps {
     schema: IDict;
     sourceData: IDict;

package/lib/formbuilder/objectform/process/dissolveProcessForm.js

@@ -1,5 +1,5 @@
-import { BaseForm } from '../baseform'; // Ensure BaseForm imports states
-import { loadFile } from '../../../tools';
+import { BaseForm, } from "../baseform"; // Ensure BaseForm imports states
+import { loadFile } from "../../../tools";
 export class DissolveForm extends BaseForm {
     constructor(options) {
         var _a;
@@ -8,7 +8,7 @@ export class DissolveForm extends BaseForm {
         this.model = options.model;
         // Ensure initial state matches IBaseFormStates
         this.state = {
-            schema: (_a = options.schema) !== null && _a !== void 0 ? _a : {} // Ensure schema is never undefined
+            schema: (_a = options.schema) !== null && _a !== void 0 ? _a : {}, // Ensure schema is never undefined
         };
         this.onFormChange = this.handleFormChange.bind(this);
         this.fetchFieldNames(options.sourceData.inputLayer);
@@ -31,7 +31,7 @@ export class DissolveForm extends BaseForm {
             const jsonData = await loadFile({
                 filepath: sourceData.path,
                 type: 'GeoJSONSource',
-                model: this.model
+                model: this.model,
             });
             if (!((_b = jsonData === null || jsonData === void 0 ? void 0 : jsonData.features) === null || _b === void 0 ? void 0 : _b.length)) {
                 return;
@@ -53,7 +53,7 @@ export class DissolveForm extends BaseForm {
         this.setState((prevState) => {
             var _a, _b, _c;
             return ({
-                schema: Object.assign(Object.assign({}, prevState.schema), { properties: Object.assign(Object.assign({}, (_a = prevState.schema) === null || _a === void 0 ? void 0 : _a.properties), { dissolveField: Object.assign(Object.assign({}, (_c = (_b = prevState.schema) === null || _b === void 0 ? void 0 : _b.properties) === null || _c === void 0 ? void 0 : _c.dissolveField), { enum: [...this.features] }) }) })
+                schema: Object.assign(Object.assign({}, prevState.schema), { properties: Object.assign(Object.assign({}, (_a = prevState.schema) === null || _a === void 0 ? void 0 : _a.properties), { dissolveField: Object.assign(Object.assign({}, (_c = (_b = prevState.schema) === null || _b === void 0 ? void 0 : _b.properties) === null || _c === void 0 ? void 0 : _c.dissolveField), { enum: [...this.features] }) }) }),
             });
         }, () => {
             this.forceUpdate();

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

@@ -1,7 +1,7 @@
-import { Ajv } from 'ajv';
 import * as geojson from '@jupytergis/schema/src/schema/geojson.json';
+import { Ajv } from 'ajv';
+import { loadFile } from "../../../tools";
 import { PathBasedSourcePropertiesForm } from './pathbasedsource';
-import { loadFile } from '../../../tools';
 /**
  * The form to modify a GeoJSON source.
  */
@@ -34,7 +34,7 @@ export class GeoJSONSourcePropertiesForm extends PathBasedSourcePropertiesForm {
                 const geoJSONData = await loadFile({
                     filepath: path,
                     type: this.props.sourceType,
-                    model: this.props.model
+                    model: this.props.model,
                 });
                 valid = this._validate(geoJSONData);
                 if (!valid) {
@@ -50,7 +50,7 @@ export class GeoJSONSourcePropertiesForm extends PathBasedSourcePropertiesForm {
         }
         if (!valid) {
             extraErrors.path = {
-                __errors: [error]
+                __errors: [error],
             };
             (_a = this._validate.errors) === null || _a === void 0 ? void 0 : _a.reverse().forEach(error => {
                 extraErrors.path.__errors.push(error.message);

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

@@ -1,7 +1,7 @@
 import { showErrorMessage } from '@jupyterlab/apputils';
-import { getMimeType } from '../../../tools';
+import { FileSelectorWidget } from "../fileselectorwidget";
+import { getMimeType } from "../../../tools";
 import { SourcePropertiesForm } from './sourceform';
-import { FileSelectorWidget } from '../fileselectorwidget';
 /**
  * The form to modify a GeoTiff source.
  */
@@ -25,8 +25,8 @@ export class GeoTiffSourcePropertiesForm extends SourcePropertiesForm {
                         'ui:widget': FileSelectorWidget,
                         'ui:options': {
                             docManager,
-                            formOptions: this.props
-                        }
+                            formOptions: this.props,
+                        },
                     } }) });
         }
         // This is not user-editable

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

@@ -1,6 +1,6 @@
 import { showErrorMessage } from '@jupyterlab/apputils';
-import { loadFile } from '../../../tools';
-import { FileSelectorWidget } from '../fileselectorwidget';
+import { FileSelectorWidget } from "../fileselectorwidget";
+import { loadFile } from "../../../tools";
 import { SourcePropertiesForm } from './sourceform';
 /**
  * The form to modify a PathBasedSource source.
@@ -26,8 +26,8 @@ export class PathBasedSourcePropertiesForm extends SourcePropertiesForm {
                 'ui:widget': FileSelectorWidget,
                 'ui:options': {
                     docManager,
-                    formOptions: this.props
-                }
+                    formOptions: this.props,
+                },
             };
         }
         // This is not user-editable
@@ -74,7 +74,7 @@ export class PathBasedSourcePropertiesForm extends SourcePropertiesForm {
                 await loadFile({
                     filepath: path,
                     type: this.props.sourceType,
-                    model: this.props.model
+                    model: this.props.model,
                 });
             }
             catch (e) {
@@ -84,7 +84,7 @@ export class PathBasedSourcePropertiesForm extends SourcePropertiesForm {
         }
         if (!valid) {
             extraErrors.path = {
-                __errors: [error]
+                __errors: [error],
             };
             this.setState(old => (Object.assign(Object.assign({}, old), { extraErrors })));
         }

package/lib/formbuilder/objectform/source/sourceform.d.ts

@@ -1,7 +1,7 @@
 import { IDict, SourceType } from '@jupytergis/schema';
-import { BaseForm, IBaseFormProps } from '../baseform';
 import { Signal } from '@lumino/signaling';
 import { IChangeEvent } from '@rjsf/core';
+import { BaseForm, IBaseFormProps } from "../baseform";
 export interface ISourceFormProps extends IBaseFormProps {
     /**
      * The source type for this form.

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

@@ -1,4 +1,4 @@
-import { BaseForm } from '../baseform';
+import { BaseForm, } from "../baseform";
 export class SourcePropertiesForm extends BaseForm {
     constructor(props) {
         super(props);

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

@@ -29,7 +29,7 @@ export class TileSourcePropertiesForm extends SourcePropertiesForm {
         schema.properties.urlParameters = {
             type: 'object',
             required: this._urlParameters,
-            properties: propertiesSchema
+            properties: propertiesSchema,
         };
         for (const parameterName of this._urlParameters) {
             switch (parameterName) {
@@ -37,12 +37,12 @@ export class TileSourcePropertiesForm extends SourcePropertiesForm {
                 case 'time':
                     propertiesSchema[parameterName] = {
                         type: 'string',
-                        format: 'date'
+                        format: 'date',
                     };
                     break;
                 default:
                     propertiesSchema[parameterName] = {
-                        type: 'string'
+                        type: 'string',
                     };
                     break;
             }