Rename utils/ExpressionParser to utils/EditingUtils, move getFeatureT…

…emplate to EditingUtils, expose in API
qgis · Apr 16, 2024 · 48d28e7 · 48d28e7
1 parent 13656d7
commit 48d28e7
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 38 deletions.
diff --git a/actions/editing.js b/actions/editing.js
@@ -8,7 +8,7 @@
 
 import editingReducer from '../reducers/editing';
 import ReducerIndex from '../reducers/index';
-import {ExpressionFeatureCache, parseExpressionsAsync} from '../utils/ExpressionParser';
+import {ExpressionFeatureCache, parseExpressionsAsync} from '../utils/EditingUtils';
 ReducerIndex.register("editing", editingReducer);
 
 export const SET_EDIT_CONTEXT = 'SET_EDIT_CONTEXT';
@@ -29,32 +29,3 @@ export function clearEditContext(contextId, newActiveContextId = null) {
         newActiveContextId: newActiveContextId
     };
 }
-
-const FeatureTemplateFactories = {};
-
-export function setFeatureTemplateFactory(dataset, factory) {
-    FeatureTemplateFactories[dataset] = factory;
-}
-
-export function getFeatureTemplate(editConfig, feature, editIface, mapPrefix, mapCrs, callback) {
-    if (editConfig.editDataset in FeatureTemplateFactories) {
-        feature = FeatureTemplateFactories[editConfig.editDataset](feature);
-    }
-    // Apply default values
-    const defaultFieldExpressions = editConfig.fields.reduce((res, field) => {
-        if (field.defaultValue) {
-            return {...res, [field.id]: field.defaultValue.replace(/^expr:/, '')};
-        }
-        return res;
-    }, {});
-    ExpressionFeatureCache.clear();
-    parseExpressionsAsync(defaultFieldExpressions, feature, editIface, mapPrefix, mapCrs).then(result => {
-        // Adjust values based on field type
-        editConfig.fields.forEach(field => {
-            if (field.id in result && field.type === "date") {
-                result[field.id] = result[field.id].split("T")[0];
-            }
-        });
-        callback({...feature, properties: {...feature.properties, ...result}});
-    });
-}
diff --git a/components/AttributeForm.jsx b/components/AttributeForm.jsx
@@ -14,10 +14,11 @@ import isEmpty from 'lodash.isempty';
 import PropTypes from 'prop-types';
 import {v1 as uuidv1} from 'uuid';
 
-import {setEditContext, clearEditContext, getFeatureTemplate} from '../actions/editing';
+import {setEditContext, clearEditContext} from '../actions/editing';
 import {LayerRole, refreshLayer} from '../actions/layers';
 import {setCurrentTaskBlocked} from '../actions/task';
 import CoordinatesUtils from '../utils/CoordinatesUtils';
+import {getFeatureTemplate} from '../utils/EditingUtils';
 import LocaleUtils from '../utils/LocaleUtils';
 import AutoEditForm from './AutoEditForm';
 import LinkFeatureForm from './LinkFeatureForm';

diff --git a/components/LinkFeatureForm.jsx b/components/LinkFeatureForm.jsx
@@ -11,8 +11,9 @@ import {connect} from 'react-redux';
 
 import PropTypes from 'prop-types';
 
-import {setEditContext, getFeatureTemplate} from '../actions/editing';
+import {setEditContext} from '../actions/editing';
 import {LayerRole, addLayerFeatures, removeLayer} from '../actions/layers';
+import {getFeatureTemplate} from '../utils/EditingUtils';
 import LocaleUtils from '../utils/LocaleUtils';
 import MapUtils from '../utils/MapUtils';
 import AttributeForm from './AttributeForm';

diff --git a/components/QtDesignerForm.jsx b/components/QtDesignerForm.jsx
@@ -16,7 +16,7 @@ import {v1 as uuidv1} from 'uuid';
 import xml2js from 'xml2js';
 
 import ConfigUtils from '../utils/ConfigUtils';
-import {parseExpression, ExpressionFeatureCache} from '../utils/ExpressionParser';
+import {parseExpression, ExpressionFeatureCache} from '../utils/EditingUtils';
 import LocaleUtils from '../utils/LocaleUtils';
 import MiscUtils from '../utils/MiscUtils';
 import EditComboField, {KeyValCache} from './EditComboField';
@@ -25,7 +25,6 @@ import Icon from './Icon';
 import Spinner from './Spinner';
 import ButtonBar from './widgets/ButtonBar';
 import DateTimeInput from './widgets/DateTimeInput';
-import NumberInput from './widgets/NumberInput';
 import TextInput from './widgets/TextInput';
 
 import './style/QtDesignerForm.css';

diff --git a/plugins/API.jsx b/plugins/API.jsx
@@ -82,7 +82,8 @@ import TextInput from '../components/widgets/TextInput.jsx';
 import ToggleSwitch from '../components/widgets/ToggleSwitch.jsx';
 import VectorLayerPicker from '../components/widgets/VectorLayerPicker.jsx';
 import CoordinatesUtils from '../utils/CoordinatesUtils';
-import EditingInterface from '../utils/EditingInterface.js';
+import EditingInterface from '../utils/EditingInterface';
+import * as EditingUtils from '../utils/EditingUtils';
 import LayerUtils from '../utils/LayerUtils';
 import * as PermaLinkUtils from '../utils/PermaLinkUtils';
 import ServiceLayerUtils from '../utils/ServiceLayerUtils';
@@ -160,6 +161,7 @@ class API extends React.Component {
         window.qwc2.getState = this.getState;
         window.qwc2.CoordinatesUtils = CoordinatesUtils;
         window.qwc2.EditingInterface = EditingInterface;
+        window.qwc2.EditingUtils = EditingUtils;
         window.qwc2.PermaLinkUtils = PermaLinkUtils;
         window.qwc2.VectorLayerUtils = VectorLayerUtils;
 

diff --git a/plugins/AttributeTable.jsx b/plugins/AttributeTable.jsx
@@ -13,7 +13,6 @@ import FileSaver from 'file-saver';
 import isEmpty from 'lodash.isempty';
 import PropTypes from 'prop-types';
 
-import {getFeatureTemplate} from '../actions/editing';
 import {LayerRole} from '../actions/layers';
 import {zoomToExtent, zoomToPoint} from '../actions/map';
 import {setCurrentTask, setCurrentTaskBlocked} from '../actions/task';
@@ -27,7 +26,7 @@ import TextInput from '../components/widgets/TextInput';
 import ConfigUtils from '../utils/ConfigUtils';
 import CoordinatesUtils from '../utils/CoordinatesUtils';
 import EditingInterface from '../utils/EditingInterface';
-import {ExpressionFeatureCache, parseExpression} from '../utils/ExpressionParser';
+import {ExpressionFeatureCache, parseExpression, getFeatureTemplate} from '../utils/EditingUtils';
 import LayerUtils from '../utils/LayerUtils';
 import LocaleUtils from '../utils/LocaleUtils';
 import MapUtils from '../utils/MapUtils';

diff --git a/plugins/Editing.jsx b/plugins/Editing.jsx
@@ -14,7 +14,7 @@ import isEqual from 'lodash.isequal';
 import PropTypes from 'prop-types';
 import {v1 as uuidv1} from 'uuid';
 
-import {setEditContext, clearEditContext, getFeatureTemplate} from '../actions/editing';
+import {setEditContext, clearEditContext} from '../actions/editing';
 import {LayerRole, addLayerFeatures, removeLayer, refreshLayer, changeLayerProperty} from '../actions/layers';
 import {setSnappingConfig} from '../actions/map';
 import {setCurrentTask, setCurrentTaskBlocked} from '../actions/task';
@@ -25,6 +25,7 @@ import SideBar from '../components/SideBar';
 import ButtonBar from '../components/widgets/ButtonBar';
 import ConfigUtils from '../utils/ConfigUtils';
 import EditingInterface from '../utils/EditingInterface';
+import {getFeatureTemplate} from '../utils/EditingUtils';
 import LayerUtils from '../utils/LayerUtils';
 import LocaleUtils from '../utils/LocaleUtils';
 import MapUtils from '../utils/MapUtils';

diff --git a/utils/ExpressionParser.js → utils/EditingUtils.js b/utils/ExpressionParser.js → utils/EditingUtils.js
@@ -101,3 +101,33 @@ export function parseExpressionsAsync(expressions, feature, editIface, mapPrefix
         }
     });
 }
+
+
+const FeatureTemplateFactories = {};
+
+export function setFeatureTemplateFactory(dataset, factory) {
+    FeatureTemplateFactories[dataset] = factory;
+}
+
+export function getFeatureTemplate(editConfig, feature, editIface, mapPrefix, mapCrs, callback) {
+    if (editConfig.editDataset in FeatureTemplateFactories) {
+        feature = FeatureTemplateFactories[editConfig.editDataset](feature);
+    }
+    // Apply default values
+    const defaultFieldExpressions = editConfig.fields.reduce((res, field) => {
+        if (field.defaultValue) {
+            return {...res, [field.id]: field.defaultValue.replace(/^expr:/, '')};
+        }
+        return res;
+    }, {});
+    ExpressionFeatureCache.clear();
+    parseExpressionsAsync(defaultFieldExpressions, feature, editIface, mapPrefix, mapCrs).then(result => {
+        // Adjust values based on field type
+        editConfig.fields.forEach(field => {
+            if (field.id in result && field.type === "date") {
+                result[field.id] = result[field.id].split("T")[0];
+            }
+        });
+        callback({...feature, properties: {...feature.properties, ...result}});
+    });
+}