Merge pull request #290 from peopledoc/intersect-conditional-rules

Filter conditional rules

Author: wo0dyn

CHANGELOG.rst

@@ -5,7 +5,7 @@ ChangeLog
 master (unreleased)
 ===================
 
-Nothing here yet.
+- Keep only existing fields ids for current role in the conditional part
 
 Release 1.2.0 (2018-01-09)
 ==========================

demo/tests/fixtures/wrong-conditions.json

@@ -4,7 +4,9 @@
       "action": "display_iff",
       "fields_ids": [
         "third-field",
-        "fourth-field"
+        "fourth-field",
+        "first-field",
+        "second-field"
       ],
       "name": "Rule",
       "tests": [
@@ -28,7 +30,17 @@
       "required": false,
       "slug": "first-field",
       "type_id": "help_text",
-      "validations": []
+      "validations": [],
+      "accesses": [
+        {
+          "access_id": "TEST_ROLE",
+          "level": "EDITABLE"
+        },
+        {
+          "access_id": "TEST_ROLE2",
+          "level": "EDITABLE"
+        }
+      ]
     },
     {
       "defaults": [],
@@ -37,9 +49,18 @@
       "label": "second field",
       "placeholder": null,
       "required": false,
-      "slug": "file",
+      "slug": "second-field",
       "type_id": "file",
-      "validations": []
+      "validations": [],
+      "accesses": [
+        {
+          "access_id": "TEST_ROLE2",
+          "level": "EDITABLE"
+        }, {
+          "access_id": "TEST_ROLE",
+          "level": "HIDDEN"
+        }
+      ]
     }
   ],
   "id": 1,

demo/tests/test_conditions.py

@@ -9,12 +9,13 @@
 
 
 from formidable import constants
+
 from formidable.forms import (
     FormidableForm, fields, get_dynamic_form_class,
     get_dynamic_form_class_from_schema
 )
 from formidable.serializers.forms import (
-    ContextFormSerializer, FormidableSerializer
+    ContextFormSerializer, FormidableSerializer, contextualize
 )
 
 TESTS_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -25,6 +26,14 @@ class ConditionTestCase(TestCase):
     def get_form_class(self, formidable, role):
         return get_dynamic_form_class(formidable, role)
 
+    @classmethod
+    def setUpTestData(cls):
+        cls.conditions_schema = json.load(open(
+            os.path.join(
+                TESTS_DIR, 'fixtures', 'wrong-conditions.json'
+            )
+        ))
+
     def setUp(self):
         conditions_schema = [
             {
@@ -207,18 +216,31 @@ def test_condition_field_doesnt_exist(self):
         doesn't have rights to read or write to it. So can't see this field
         in the 'fields' section.
         """
-        schema = json.load(open(
-            os.path.join(
-                TESTS_DIR, 'fixtures', 'wrong-conditions.json'
-            )
-        ))
+
         try:
-            get_dynamic_form_class_from_schema(schema)
+            get_dynamic_form_class_from_schema(self.conditions_schema)
         except KeyError:
             self.fail("Doesn't have to raise an exception here ")
         else:
             self.assertTrue(True)
 
+    def test_filter_conditions_by_fields_ids(self):
+        first_schema = contextualize(self.conditions_schema, 'TEST_ROLE')
+        conditions = first_schema['conditions']
+        self.assertEqual(len(conditions), 1)
+        condition = conditions[0]
+
+        self.assertEqual(condition['fields_ids'], ['first-field'])
+
+        second_schema = contextualize(self.conditions_schema, 'TEST_ROLE2')
+        conditions = second_schema['conditions']
+        self.assertEqual(len(conditions), 1)
+        condition = conditions[0]
+        self.assertEqual(
+            sorted(condition['fields_ids']),
+            ['first-field', 'second-field']
+        )
+
 
 class ConditionFromSchemaTestCase(ConditionTestCase):
 

formidable/serializers/forms.py

@@ -181,4 +181,12 @@ def contextualize(form, role):
     """
     form = copy.deepcopy(form)
     form['fields'] = list(contextualize_fields(form['fields'], role))
+
+    # filter conditions by fields ids for current role
+    field_ids = {field['slug'] for field in form['fields']}
+    for condition in form.get('conditions', []):
+        condition['fields_ids'] = list(
+            set(condition.get('fields_ids', [])) & field_ids
+        )
+
     return form