Include virtual fields in edit config

Author: manisandro

src/config_generator/dnd_form_generator.py

@@ -285,9 +285,6 @@ def __create_relation_widget(self, projectname, layername, project, relation, sh
             fields = referencingLayer.findall("fieldConfiguration/field")
             col = 0
             for field in fields:
-                # Skip expression fields
-                if referencingLayer.find("expressionfields/field[@name='%s']" % field.get("name")) is not None:
-                    continue
 
                 # Skip foreign key field
                 if field.get("name") == fkField:
@@ -437,10 +434,6 @@ def __add_autolayout_fields(self, maplayer, projectname, layername, project, par
         row = 0
 
         for field in fields:
-            # Skip expression fields
-            if maplayer.find("expressionfields/field[@name='%s']" % field.get("name")) is not None:
-                continue
-
             editorWidget = self.__create_editor_widget(maplayer, projectname, layername, project, field.get("name"))
             if editorWidget is None:
                 continue

src/config_generator/map_viewer_config.py

@@ -966,10 +966,6 @@ def edit_config(self, map_name, cfg_item, assets_dir):
             for attr in meta.get('attributes'):
                 field = meta['fields'].get(attr, {})
 
-                if field.get('expression'):
-                    # Skip expression field
-                    continue
-
                 alias = field.get('alias', attr)
                 data_type = self.EDIT_FIELD_TYPES.get(
                     field.get('data_type'), 'text'
@@ -988,6 +984,9 @@ def edit_config(self, map_name, cfg_item, assets_dir):
                 if 'filterExpression' in field:
                     edit_field['filterExpression'] = field['filterExpression']
 
+                if 'expression' in field:
+                    edit_field['expression'] = field['expression']
+
                 if 'constraints' in field:
                     # add any constraints
                     edit_field['constraints'] = field['constraints']

src/config_generator/qgs_reader.py

@@ -435,7 +435,12 @@ def __attributes_metadata(self, maplayer):
             if default is not None and default.get('expression'):
                 fields[field]['defaultValue'] = default.get('expression')
 
-            # any any filter expression
+            # virtual fields
+            expressionField = maplayer.find("expressionfields/field[@name='%s']" % field)
+            if expressionField is not None and expressionField.get('expression'):
+                fields[field]['expression'] = expressionField.get('expression')
+
+            # filter expression
             filterExpression = maplayer.find("fieldConfiguration/field[@name='%s']/editWidget[@type='ValueRelation']/config/Option/Option[@name='FilterExpression']" % field)
             if filterExpression is not None and filterExpression.get('value'):
                 fields[field]['filterExpression'] = filterExpression.get('value')
@@ -445,12 +450,6 @@ def __attributes_metadata(self, maplayer):
             if constraints:
                 fields[field]['constraints'] = constraints
 
-            expressionfields_field = maplayer.find(
-                "expressionfields/field[@name='%s']" % field
-            )
-            if expressionfields_field is not None:
-                fields[field]['expression'] = expressionfields_field.get('expression').lstrip("'").rstrip("'")
-
             fields[field]['joinfield'] = joinfields.get(field, None)
 
         displayField = None