Improve form property logic validation for checkbox conditions

- Update FormPropertyLogicRule to handle operators without values
- Add support for checkbox conditions like 'is_checked' and 'is_not_checked'
- Refactor logic validation in both API and client-side implementations
- Remove unnecessary console.log statements
- Update error modal text for better user experience

client/components/open/forms/components/FormEditor.vue

@@ -236,7 +236,6 @@ export default {
     saveForm() {
       // Apply defaults to the form
       const defaultedData = setFormDefaults(this.form.data())
-      console.log('defaultedData', defaultedData)
       this.form.fill(defaultedData)
   
       this.form.properties = validatePropertiesLogic(this.form.properties)

client/components/open/forms/components/form-components/FormErrorModal.vue

@@ -4,8 +4,8 @@
     @close="$emit('close')"
   >
     <div class="-mx-5">
-      <h2 class="text-red-600 text-2xl font-bold mb-4 px-4">
-        Error saving your form
+      <h2 class="text-red-600 text-2xl font-medium mb-4 px-4">
+        We couldn't save your form
       </h2>
 
       <div

client/components/open/forms/fields/components/FieldOptions.vue

@@ -833,7 +833,11 @@ export default {
 
       // Apply type-specific defaults from blocks_types.json if available
       if (this.field.type in blocksTypes && blocksTypes[this.field.type]?.default_values) {
-        Object.assign(this.field, blocksTypes[this.field.type].default_values)
+        Object.keys(blocksTypes[this.field.type].default_values).forEach(key => {
+          if (!_has(this.field, key)) {
+            this.field[key] = blocksTypes[this.field.type].default_values[key]
+          }
+        })
       }
 
       // Apply additional defaults from defaultFieldValues if needed

client/composables/forms/validatePropertiesLogic.js

@@ -3,6 +3,8 @@ import FormPropertyLogicRule from "~/lib/forms/FormPropertyLogicRule.js"
 export const validatePropertiesLogic = (properties) => {
   properties.forEach((field) => {
     const isValid = new FormPropertyLogicRule(field).isValid()
+    console.log('field', field)
+    console.log('isValid', isValid, field.name)
     if (!isValid) {
       field.logic = {
         conditions: null,

client/lib/forms/FormPropertyLogicRule.js

@@ -22,6 +22,7 @@ class FormPropertyLogicRule {
 
   isValid() {
     if (this.logic && this.logic["conditions"]) {
+      console.log('logic', this.logic)
       this.checkConditions(this.logic["conditions"])
       this.checkActions(
         this.logic && this.logic["actions"] ? this.logic["actions"] : null,
@@ -62,8 +63,7 @@ class FormPropertyLogicRule {
       condition["value"] === undefined ||
       condition["value"]["property_meta"] === undefined ||
       condition["value"]["property_meta"]["type"] === undefined ||
-      condition["value"]["operator"] === undefined ||
-      condition["value"]["value"] === undefined
+      condition["value"]["operator"] === undefined
     ) {
       this.isConditionCorrect = false
       return
@@ -71,8 +71,7 @@ class FormPropertyLogicRule {
 
     const typeField = condition["value"]["property_meta"]["type"]
     const operator = condition["value"]["operator"]
-    const value = condition["value"]["value"]
-
+    
     if (
       this.CONDITION_MAPPING[typeField] === undefined ||
       this.CONDITION_MAPPING[typeField]["comparators"][operator] === undefined
@@ -81,23 +80,34 @@ class FormPropertyLogicRule {
       return
     }
 
-    const type =
-      this.CONDITION_MAPPING[typeField]["comparators"][operator][
-        "expected_type"
-      ]
-    if (Array.isArray(type)) {
-      let foundCorrectType = false
-      type.forEach((subtype) => {
-        if (this.valueHasCorrectType(subtype, value)) {
-          foundCorrectType = true
+    // Check if operator needs a value based on comparator definition
+    const comparatorDef = this.CONDITION_MAPPING[typeField]["comparators"][operator]
+    const needsValue = Object.keys(comparatorDef).length > 0
+    
+    if (needsValue && condition["value"]["value"] === undefined) {
+      this.isConditionCorrect = false
+      return
+    }
+
+    // Only check value type if comparator expects one
+    if (needsValue) {
+      const type = comparatorDef["expected_type"]
+      const value = condition["value"]["value"]
+      
+      if (Array.isArray(type)) {
+        let foundCorrectType = false
+        type.forEach((subtype) => {
+          if (this.valueHasCorrectType(subtype, value)) {
+            foundCorrectType = true
+          }
+        })
+        if (!foundCorrectType) {
+          this.isConditionCorrect = false
+        }
+      } else {
+        if (!this.valueHasCorrectType(type, value)) {
+          this.isConditionCorrect = false
         }
-      })
-      if (!foundCorrectType) {
-        this.isConditionCorrect = false
-      }
-    } else {
-      if (!this.valueHasCorrectType(type, value)) {
-        this.isConditionCorrect = false
       }
     }
   }
@@ -151,3 +161,4 @@ class FormPropertyLogicRule {
 }
 
 export default FormPropertyLogicRule
+