Make block editing forms more robust for Plone 6.2 and handle field flattening/ordering correctly

Author: erral

src/cs_dynamicpages/browser/forms.py

@@ -33,25 +33,33 @@ def _get_ordered_fields(self, all_fields_dict, allowed_fields):
         # Always keep row_type
         for n in ["IDynamicPageRow.row_type", "row_type"]:
             if n in all_fields_dict:
-                new_fields_list.append(all_fields_dict[n])
+                f = all_fields_dict[n]
+                # Ensure it's not hidden
+                f.mode = None 
+                new_fields_list.append(f)
                 del all_fields_dict[n]
                 break
 
         # Add allowed fields in order
         for field_name in allowed_fields:
             matched_name = self._find_matched_field(all_fields_dict, field_name)
             if matched_name:
-                new_fields_list.append(all_fields_dict[matched_name])
+                f = all_fields_dict[matched_name]
+                f.mode = None # Force visible
+                new_fields_list.append(f)
                 del all_fields_dict[matched_name]
 
         # Always include Title
         for n in ["IBasic.title", "title"]:
             if n in all_fields_dict:
-                new_fields_list.append(all_fields_dict[n])
+                f = all_fields_dict[n]
+                f.mode = None # Force visible
+                new_fields_list.append(f)
                 del all_fields_dict[n]
 
         return new_fields_list
 
+
     def _find_matched_field(self, all_fields_dict, field_name):
         if field_name in all_fields_dict:
             return field_name
@@ -85,6 +93,33 @@ def updateFields(self):
         super().updateFields()
         self._flatten_and_order_fields()
 
+    def updateWidgets(self):
+        super().updateWidgets()
+        # Safety net: ensure unwanted widgets are not there
+        row_type = self._get_current_row_type()
+        if row_type:
+            config = get_row_config(row_type)
+            if config:
+                allowed_fields = config.get("each_row_type_fields", [])
+                self._filter_widgets_manager(self.widgets, allowed_fields)
+                for group in self.groups:
+                    if hasattr(group, "widgets"):
+                        self._filter_widgets_manager(group.widgets, allowed_fields)
+
+    def _filter_widgets_manager(self, widgets, allowed_fields):
+        to_delete = []
+        for name, widget in widgets.items():
+            if widget.field.__name__ in ["row_type", "title"]:
+                continue
+            is_allowed = name in allowed_fields or widget.field.__name__ in allowed_fields
+            if not is_allowed:
+                norm_name = name.replace(".", "-")
+                is_allowed = norm_name in allowed_fields
+            if not is_allowed:
+                to_delete.append(name)
+        for name in to_delete:
+            del widgets[name]
+
     def row_type_configs(self):
         return json.dumps(get_available_views_for_row())
 
@@ -96,6 +131,32 @@ def updateFields(self):
         super().updateFields()
         self._flatten_and_order_fields()
 
+    def updateWidgets(self):
+        super().updateWidgets()
+        row_type = self._get_current_row_type()
+        if row_type:
+            config = get_row_config(row_type)
+            if config:
+                allowed_fields = config.get("each_row_type_fields", [])
+                self._filter_widgets_manager(self.widgets, allowed_fields)
+                for group in self.groups:
+                    if hasattr(group, "widgets"):
+                        self._filter_widgets_manager(group.widgets, allowed_fields)
+
+    def _filter_widgets_manager(self, widgets, allowed_fields):
+        to_delete = []
+        for name, widget in widgets.items():
+            if widget.field.__name__ in ["row_type", "title"]:
+                continue
+            is_allowed = name in allowed_fields or widget.field.__name__ in allowed_fields
+            if not is_allowed:
+                norm_name = name.replace(".", "-")
+                is_allowed = norm_name in allowed_fields
+            if not is_allowed:
+                to_delete.append(name)
+        for name in to_delete:
+            del widgets[name]
+
     def row_type_configs(self):
         return json.dumps(get_available_views_for_row())
 

src/cs_dynamicpages/tests/test_block_editing_forms.py

@@ -86,17 +86,31 @@ def test_complex_widget_hidden_crash(self):
         # when they are supposed to be hidden.
         from plone.app.z3cform.interfaces import IPloneFormLayer
         from zope.interface import alsoProvides
+        from z3c.form.interfaces import HIDDEN_MODE
 
-        self.row.row_type = "cs_dynamicpages-text-view"  # Hide ICollection fields
-
+        self.row.row_type = "cs_dynamicpages-text-view" # Hide ICollection fields
+        
         request = self.portal.REQUEST.clone()
         alsoProvides(request, IPloneFormLayer)
-
+        
         form = RowEditForm(self.row, request)
         form.update()
+        
+        # Manually add a widget in HIDDEN_MODE to see if it crashes
+        # using a field that uses OrderedSelectWidget if possible
+        # but here we just check if any widget is in HIDDEN_MODE
+        for widget in form.widgets.values():
+            if widget.mode == HIDDEN_MODE:
+                # If we have widgets in HIDDEN_MODE, rendering might crash
+                # if they don't have a 'hidden' template.
+                pass
+
         # This should trigger the rendering which might crash
         try:
             rendered = form()
-            self.assertIn("IRichTextBehavior-text", rendered)
+            self.assertIn('IRichTextBehavior-text', rendered)
+            # Check that unwanted fields are NOT in rendered output
+            self.assertNotIn('ICollection-customViewFields', rendered)
         except Exception as e:
             self.fail(f"Form rendering failed with {type(e).__name__}: {e}")
+