fix migration bugs, handle set fields

src/jazkarta/easyformplugin/salesforce/action.py

@@ -118,6 +118,8 @@ def prepare_salesforce_data(self, fields, form_input, expr_context):
         """
         data = {}
         for sf_fieldname, value in fields.items():
+            if not sf_fieldname:
+                continue
             # evaluate expressions
             expr = None
             if value.startswith("form:"):
@@ -138,6 +140,8 @@ def prepare_salesforce_data(self, fields, form_input, expr_context):
             if isinstance(value, (date, datetime)):
                 # serialize dates and datetimes (not handled by json.dumps)
                 value = value.isoformat()
+            elif isinstance(value, set):
+                value = ";".join(value)
 
             data[sf_fieldname] = value
         return data

src/jazkarta/easyformplugin/salesforce/migration.py

@@ -16,9 +16,8 @@ def append_sf_action(schema, type_, name, properties):
         raise NotImplementedError("Unsupported creationMode: {}".format(creation_mode))
     fields = {}
     for item in properties["fieldMap"]:
-        if "/" in item["field_path"]:
-            raise NotImplementedError("Fields in fieldset folders not supported yet.")
-        fields[item["sf_field"]] = "form:" + item["field_path"]
+        path = item["field_path"].split(',')[-1]
+        fields[item["sf_field"]] = "form:" + path
     for item in properties["presetValueMap"]:
         fields[item["sf_field"]] = item["value"]
     op = {
@@ -41,7 +40,7 @@ def append_sf_action(schema, type_, name, properties):
             "does not support chained adapters at this time)."
         )
 
-    append_node(node, "operations", json.dumps([op]))
+    append_node(node, "operations", json.dumps([op], indent=4))
     return node
 
 

src/jazkarta/easyformplugin/salesforce/prefill.py

@@ -12,6 +12,7 @@
 from zope.schema import getFields
 from zope.schema.interfaces import IField
 from zope.schema.interfaces import IDate
+from zope.schema.interfaces import ISet
 
 from .action import SF_CREDENTIALS
 from .interfaces import IJazkartaEasyformpluginSalesforceLayer
@@ -83,8 +84,11 @@ def query(self):
 
     def get(self):
         value = self.query().get(self.sf_field)
-        if value and IDate.providedBy(self.field):
-            value = parse(value)
+        if value:
+            if IDate.providedBy(self.field):
+                value = parse(value)
+            elif ISet.providedBy(self.field):
+                value = set(value.split(';'))
         return value