Initialize value input to property default

1 files changed, 7 insertions, 3 deletions

diff --git a/client/js/app/src/app/pages/querybuilder/context/query-builder-provider.jsx b/client/js/app/src/app/pages/querybuilder/context/query-builder-provider.jsx
index df9b8a105a0..23c4af165f0 100644
--- a/client/js/app/src/app/pages/querybuilder/context/query-builder-provider.jsx
+++ b/client/js/app/src/app/pages/querybuilder/context/query-builder-provider.jsx
@@ -106,7 +106,11 @@ function inputAdd(params, { id: parentId, type: typeName }) {
       ? { name: typeName, type: parent.type.children }
       : parent.type.children[typeName];
 
-  parent.value.push({ id, value: type.children ? [] : '', type });
+  parent.value.push({
+    id,
+    value: type.children ? [] : type.default?.toString() ?? '',
+    type,
+  });
 
   return cloned;
 }
@@ -120,8 +124,8 @@ function inputUpdate(params, { id, type, value }) {
       typeof parent.type.children === 'string'
         ? { name: type, type: parent.type.children }
         : parent.type.children[type];
-    if ((node.type.children != null) !== (newType.children != null))
-      node.value = newType.children ? [] : '';
+    if (node.type.type !== newType.type.type)
+      node.value = newType.children ? [] : newType.default?.toString() ?? '';
     node.type = newType;
   }
   if (value != null) node.value = value;