django-forms-workflows 0.72.3__tar.gz → 0.72.4__tar.gz

{django_forms_workflows-0.72.3 → django_forms_workflows-0.72.4}/CHANGELOG.md

@@ -7,6 +7,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.72.4] - 2026-04-23
+
+### Fixed
+- **Conditionally-visible fields no longer dropped from submissions.**
+  The form builder UI and client-side evaluator used `is_not_empty`
+  while the server-side `evaluate_conditions` only recognised
+  `not_empty`. Any `show`-gated field whose rule depended on
+  `is_not_empty` was treated as hidden on submit, stripped from
+  `cleaned_data`, and never written to `form_data` — so its label
+  did not render in the submission detail view while client-side JS
+  happily showed and accepted input. Standardised on `not_empty`
+  across `form-builder.js`, `form-enhancements.js`, and
+  `workflow-builder.js`; the dropdown still reads "Is Not Empty" but
+  now emits the canonical value. Data migration
+  `0093_normalize_conditional_operators` rewrites any existing
+  `FormField.conditional_rules` in place.
+
 ## [0.72.3] - 2026-04-18
 
 ### Fixed

{django_forms_workflows-0.72.3 → django_forms_workflows-0.72.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-forms-workflows
-Version: 0.72.3
+Version: 0.72.4
 Summary: Enterprise-grade, database-driven form builder with approval workflows and external data integration
 License: LGPL-3.0-only
 License-File: LICENSE

django_forms_workflows-0.72.4/django_forms_workflows/migrations/0093_normalize_conditional_operators.py

@@ -0,0 +1,51 @@
+"""
+Normalize FormField.conditional_rules: rewrite the client-only ``is_not_empty``
+operator to the canonical ``not_empty`` recognised by
+``django_forms_workflows.conditions.evaluate_conditions``.
+
+Prior to this migration, the form builder UI wrote ``is_not_empty`` into each
+field's ``conditional_rules`` JSON, but the server-side evaluator only knew
+about ``not_empty``. On submission ``clean()`` treated ``show``-gated fields as
+hidden and dropped their values, so they never reached ``form_data`` and did
+not render in the submission detail view.
+"""
+
+from django.db import migrations
+
+
+def _rewrite_rules(rules):
+    """Recursively swap ``is_not_empty`` → ``not_empty`` in a rules blob."""
+    if isinstance(rules, list):
+        return [_rewrite_rules(r) for r in rules]
+    if isinstance(rules, dict):
+        out = {}
+        for k, v in rules.items():
+            if k == "operator" and v == "is_not_empty":
+                out[k] = "not_empty"
+            elif k == "conditions":
+                out[k] = [_rewrite_rules(c) for c in (v or [])]
+            else:
+                out[k] = _rewrite_rules(v) if isinstance(v, list | dict) else v
+        return out
+    return rules
+
+
+def forwards(apps, schema_editor):
+    FormField = apps.get_model("django_forms_workflows", "FormField")
+    for field in FormField.objects.exclude(conditional_rules__isnull=True):
+        original = field.conditional_rules
+        rewritten = _rewrite_rules(original)
+        if rewritten != original:
+            field.conditional_rules = rewritten
+            field.save(update_fields=["conditional_rules"])
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("django_forms_workflows", "0092_add_user_notification_preference"),
+    ]
+
+    operations = [
+        migrations.RunPython(forwards, migrations.RunPython.noop),
+    ]

{django_forms_workflows-0.72.3 → django_forms_workflows-0.72.4}/django_forms_workflows/static/django_forms_workflows/js/form-builder.js

@@ -1096,7 +1096,7 @@ class FormBuilder {
                             <option value="greater_than" ${condition.operator === 'greater_than' ? 'selected' : ''}>Greater Than</option>
                             <option value="less_than" ${condition.operator === 'less_than' ? 'selected' : ''}>Less Than</option>
                             <option value="is_empty" ${condition.operator === 'is_empty' ? 'selected' : ''}>Is Empty</option>
-                            <option value="is_not_empty" ${condition.operator === 'is_not_empty' ? 'selected' : ''}>Is Not Empty</option>
+                            <option value="not_empty" ${condition.operator === 'not_empty' || condition.operator === 'is_not_empty' ? 'selected' : ''}>Is Not Empty</option>
                         </select>
                     </div>
                     <div class="col-md-4">

{django_forms_workflows-0.72.3 → django_forms_workflows-0.72.4}/django_forms_workflows/static/django_forms_workflows/js/form-enhancements.js

@@ -206,7 +206,7 @@ class FormEnhancements {
                 return !notInValues.includes(String(fieldValue));
             case 'is_empty':
                 return !fieldValue || fieldValue === '' || (Array.isArray(fieldValue) && fieldValue.length === 0);
-            case 'is_not_empty':
+            case 'not_empty':
                 return fieldValue && fieldValue !== '' && (!Array.isArray(fieldValue) || fieldValue.length > 0);
             case 'is_true':
                 return fieldValue === true || fieldValue === 'true' || fieldValue === '1';

{django_forms_workflows-0.72.3 → django_forms_workflows-0.72.4}/django_forms_workflows/static/django_forms_workflows/js/workflow-builder.js

@@ -2933,7 +2933,7 @@ class WorkflowBuilder {
                         'contains': 'contains',
                         'not_contains': 'not contains',
                         'is_empty': 'is empty',
-                        'is_not_empty': 'is not empty'
+                        'not_empty': 'is not empty'
                     };
                     const op = operatorSymbols[node.data.operator] || node.data.operator;
                     return `If ${node.data.field} ${op} ${node.data.value || ''}`;

{django_forms_workflows-0.72.3 → django_forms_workflows-0.72.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-forms-workflows"
-version = "0.72.3"
+version = "0.72.4"
 description = "Enterprise-grade, database-driven form builder with approval workflows and external data integration"
 license = "LGPL-3.0-only"
 readme = "README.md"