form0-core 0.1.17 → 0.1.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "form0-core",
-  "version": "0.1.17",
+  "version": "0.1.19",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
   },

package/src/utilities/dataset-descriptors.js

@@ -32,6 +32,9 @@ const toFiniteNumberOrNull = (value) => {
   return Number.isFinite(parsed) ? parsed : null;
 };
 
+const toBooleanOrDefault = (value, fallback = false) =>
+  typeof value === 'boolean' ? value : fallback;
+
 const toSchemaFormNode = (schema) => {
   if (!isRecord(schema)) {
     return null;
@@ -349,7 +352,7 @@ const toSingleChoiceLabel = (field, rawValue) => {
     context: 'projectDatasetRowValues',
   });
   if (labels.length === 0) {
-    return rawValue;
+    return undefined;
   }
 
   return labels.length === 1 ? labels[0] : labels;
@@ -360,7 +363,7 @@ const toMultiChoiceLabels = (field, rawValue) => {
     context: 'projectDatasetRowValues',
   });
   if (labels.length === 0) {
-    return rawValue;
+    return undefined;
   }
 
   return labels;
@@ -471,6 +474,8 @@ const collectRepeatableDatasets = (elements, context, datasets) => {
       repeatable_field_id: repeatableFieldId,
       repeatable_output_key: repeatableOutputKey,
       root_dataset_id: ROOT_DATASET_ID,
+      location_enabled: toBooleanOrDefault(element.location_enabled),
+      location_required: toBooleanOrDefault(element.location_required),
       fields: [],
     };
 
@@ -507,6 +512,8 @@ export function buildDatasetDescriptors(schema) {
     repeatable_field_id: null,
     repeatable_output_key: null,
     root_dataset_id: ROOT_DATASET_ID,
+    location_enabled: toBooleanOrDefault(formNode.location_enabled),
+    location_required: toBooleanOrDefault(formNode.location_required),
     fields: [],
   };
 
@@ -600,7 +607,10 @@ export function projectDatasetRowValues(descriptor, rowValues) {
       return;
     }
 
-    displayValues[field.field_id] = toDisplayValue(field, rawValue);
+    const displayValue = toDisplayValue(field, rawValue);
+    if (typeof displayValue !== 'undefined') {
+      displayValues[field.field_id] = displayValue;
+    }
 
     if (field.query_kind === 'scalar') {
       const scalarValue = normalizeScalarValue(field, rawValue);