Fix overwrite side-eddect

Author: fsbraun

djangocms_frontend/component_pool.py

@@ -35,14 +35,14 @@ class CMSAutoComponentDiscovery:
     }
 
     def __init__(self, register_to):
+        self.default_field_context.update(settings.COMPONENT_FIELDS)
         templates = find_cms_component_templates()
         auto_components = self.scan_templates_for_component_declaration(templates)
         for component in auto_components:
             register_to.register(component)
 
     def get_field_context(self) -> dict:
         field_context = {}
-        self.default_field_context.update(settings.COMPONENT_FIELDS)
         for key, value in self.default_field_context.items():
             if apps.is_installed(key) and "." in value:
                 module, field_name = value.rsplit(".", 1)
@@ -56,7 +56,7 @@ def component_factory(module, component: tuple, fields: list[tuple], template: s
 
         kwargs["render_template"] = template
         meta = type("Meta", (), kwargs)
-        cls = type(
+        return type(
             name,
             (CMSFrontendComponent,),
             {
@@ -70,22 +70,20 @@ def component_factory(module, component: tuple, fields: list[tuple], template: s
                 },
             },
         )
-        return cls
 
     def scan_templates_for_component_declaration(self, templates: list[tuple[str, str]]) -> list[CMSFrontendComponent]:
         from django.forms import fields
 
-        components = []
         field_context = self.get_field_context()
         for module, template_name in templates:
             # Create a new context for each template
             context = {"_cms_components": defaultdict(list), "forms": fields, "instance": {}, **field_context}
             try:
                 loader.render_to_string(template_name, context)
                 cms_component = context["_cms_components"].get("cms_component", [])
-                fields = context["_cms_components"].get("fields", [])
+                discovered_fields = context["_cms_components"].get("fields", [])
                 if len(cms_component) == 1:
-                    components.append(self.component_factory(module, cms_component[0], fields, template_name))
+                    yield self.component_factory(module, cms_component[0], discovered_fields, template_name)
                 elif len(cms_component) > 1:  # pragma: no cover
                     raise ValueError(f"Multiple cms_component tags found in {template_name}")
             except Exception:  # pragma: no cover
@@ -97,7 +95,6 @@ def scan_templates_for_component_declaration(self, templates: list[tuple[str, st
                     f"Error rendering template {template_name} to scan for cms frontend components", exc_info=True
                 )
                 pass
-        return components
 
 
 class Components:

tests/test_autocomponent.py

@@ -41,27 +41,31 @@ def test_render_autocomponent(self):
         self.assertContains(response, "My Hero")
         self.assertContains(response, "My Hero Slogan")
 
-    def test_split_template_tag(self):
-        from djangocms_frontend.templatetags.cms_component import split
-
-        self.assertEqual(split("hero.html"), ["hero.html"])
-        self.assertEqual(split("Mixin1|Mixin2"), ["Mixin1", "Mixin2"])
-        self.assertEqual(split("hero.html"), ["hero.html"])
-        self.assertEqual(split("hero.html, Mixin1, Mixin2", ", "), ["hero.html", "Mixin1", "Mixin2"])
-
     def test_autocomponents_slots_are_created(self):
         from cms.plugin_pool import plugin_pool
 
         self.assertIn("AutoHeroWithSlotsPlugin", plugin_pool.plugins)
 
         plugin = plugin_pool.get_plugin("AutoHeroWithSlotsPlugin")
         model = plugin.model
-
+        form = plugin.form
         self.assertEqual(model.__name__, "AutoHeroWithSlots")
+        self.assertIn("title", form.declared_fields)
+        self.assertIn("slogan", form.declared_fields)
+        self.assertIn("hero_image", form.declared_fields)
+        self.assertIn("config", form.declared_fields)  # Inherited from djangocms_frontend.models.FrontendUIItem
         self.assertTrue(plugin.allow_children)
         self.assertEqual(plugin.child_classes, ["AutoHeroWithSlotsButtonsPlugin"])
 
         self.assertIn("AutoHeroWithSlotsButtonsPlugin", plugin_pool.plugins)
         slot_plugin = plugin_pool.get_plugin("AutoHeroWithSlotsButtonsPlugin")
 
         self.assertEqual(slot_plugin.parent_classes, ["AutoHeroWithSlotsPlugin"])
+
+    def test_split_template_tag(self):
+        from djangocms_frontend.templatetags.cms_component import split
+
+        self.assertEqual(split("hero.html"), ["hero.html"])
+        self.assertEqual(split("Mixin1|Mixin2"), ["Mixin1", "Mixin2"])
+        self.assertEqual(split("hero.html"), ["hero.html"])
+        self.assertEqual(split("hero.html, Mixin1, Mixin2", ", "), ["hero.html", "Mixin1", "Mixin2"])