Replace collective.volto.formsupport with plone.formblock (#246)

.vscode/settings.json

@@ -1,9 +1,8 @@
 {
   "eslint.workingDirectories": ["./frontend"],
-  "flake8.cwd": "${workspaceFolder}/backend",
-  "flake8.args": ["--config=pyproject.toml"],
   "ruff.organizeImports": true,
   "python.terminal.activateEnvironment": true,
+  "python.defaultInterpreterPath": "${workspaceFolder}/backend/.venv/bin/python",
   "python.testing.pytestArgs": [
     "backend/tests"
   ],

backend/news/+pytest.internal

@@ -0,0 +1 @@
+Update pytest-plone to version 1.0.0. @ericof

backend/news/246.feature

@@ -0,0 +1 @@
+Add plone.formblock dependency and uninstall collective.volto.formsupport. @ericof

backend/pyproject.toml

@@ -29,6 +29,7 @@ dependencies = [
     "plone.app.querystring==2.1.7",
     "kitconcept.voltolighttheme>=8.0.0a9",
     "collective.volto.formsupport==3.2.3",
+    "plone.formblock>=1.0.0a2",
     "collective.honeypot",
     "collective.person==1.0.0b4",
     "plone.exportimport>=2.0.0a2",
@@ -41,7 +42,7 @@ test = [
     "plone.restapi[test]",
     "pytest",
     "pytest-cov",
-    "pytest-plone>=1.0.0a1",
+    "pytest-plone>=1.0.0",
 ]
 
 [dependency-groups]

backend/src/kitconcept/core/dependencies.zcml

@@ -1,11 +1,34 @@
 <configure xmlns="http://namespaces.zope.org/zope">
 
+  <include
+      package="z3c.unconfigure"
+      file="meta.zcml"
+      />
+
   <!-- List all packages you depend here -->
   <include package="plone.restapi" />
   <include package="plone.volto" />
   <include package="collective.person" />
   <include package="kitconcept.voltolighttheme" />
-  <include package="collective.volto.formsupport" />
   <include package="plonegovbr.socialmedia" />
 
+  <include package="collective.volto.formsupport" />
+
+  <!-- Unconfigure components from collective.volto.formsupport -->
+  <unconfigure>
+    <utility
+        factory="collective.volto.formsupport.datamanager.catalog.FormDataSoupCatalogFactory"
+        provides="souper.interfaces.ICatalogFactory"
+        name="form_data"
+        />
+    <adapter
+        factory="collective.volto.formsupport.restapi.services.form_data.form_data.FormData"
+        name="form-data"
+        />
+  </unconfigure>
+
+  <!-- Include the plone.formblock package -->
+  <include package="plone.formblock" />
+
+
 </configure>

backend/src/kitconcept/core/factory.py

@@ -61,6 +61,8 @@
     "plone.restapi",
     "plone.volto",
     "kitconcept.voltolighttheme",
+    "collective.volto.formsupport",
+    "plone.formblock",
     "plonegovbr.socialmedia",
 ]
 _PLONE_PROFILES = [
@@ -97,8 +99,10 @@
     "plone.volto:default",
     "kitconcept.voltolighttheme:default",
     "kitconcept.voltolighttheme:demo",
-    "collective.volto.formsupport:default",
+    "plone.formblock:default",
     "plonegovbr.socialmedia:demo",
+    # Leave it here until we remove the package
+    "collective.volto.formsupport:default",
 ]
 
 
@@ -149,9 +153,9 @@ class LocalAddonList:
         Addon(profile_id="plonetheme.barceloneta:default"),
         Addon(profile_id="kitconcept.voltolighttheme:default"),
         Addon(profile_id="collective.person:default"),
-        Addon(profile_id="collective.volto.formsupport:default"),
         Addon(profile_id="plonegovbr.socialmedia:default"),
         Addon(profile_id="kitconcept.core:dependencies"),
+        Addon(profile_id="plone.formblock:default"),
     ])
 
 

backend/src/kitconcept/core/profiles/base/metadata.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metadata>
-  <version>20260505001</version>
+  <version>20260619001</version>
 </metadata>

backend/src/kitconcept/core/profiles/dependencies/metadata.xml

@@ -8,7 +8,7 @@
     <dependency>profile-plone.volto:default</dependency>
     <dependency>profile-collective.person:default</dependency>
     <dependency>profile-kitconcept.voltolighttheme:default</dependency>
-    <dependency>profile-collective.volto.formsupport:default</dependency>
     <dependency>profile-plonegovbr.socialmedia:default</dependency>
+    <dependency>profile-plone.formblock:default</dependency>
   </dependencies>
 </metadata>

backend/src/kitconcept/core/upgrades/configure.zcml

@@ -12,5 +12,6 @@
   <include package=".v20260122001" />
   <include package=".v20260504001" />
   <include package=".v20260505001" />
+  <include package=".v20260619001" />
 
 </configure>

backend/src/kitconcept/core/upgrades/v20260619001/configure.zcml

@@ -0,0 +1,21 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
+    >
+
+  <genericsetup:upgradeSteps
+      profile="kitconcept.core:base"
+      source="20260505001"
+      destination="20260619001"
+      >
+    <genericsetup:upgradeDepends
+        title="Remove collective.volto.formsupport dependency"
+        import_profile="collective.volto.formsupport:uninstall"
+        />
+    <genericsetup:upgradeDepends
+        title="Install plone.formblock dependency"
+        import_profile="plone.formblock:default"
+        />
+  </genericsetup:upgradeSteps>
+
+</configure>

backend/tests/conftest.py

@@ -3,7 +3,6 @@
 from kitconcept.core.testing import FUNCTIONAL_TESTING
 from kitconcept.core.testing import INTEGRATION_TESTING
 from pytest_plone import fixtures_factory
-from zope.component.hooks import site
 
 import pytest
 
@@ -32,18 +31,7 @@ def current_versions() -> CurrentVersions:
     from kitconcept.core import __version__
 
     return CurrentVersions(
-        base="20260505001",
+        base="20260619001",
         dependencies="1000",
         package=__version__,
     )
-
-
-@pytest.fixture(scope="class")
-def portal_class(integration_class):
-    if hasattr(integration_class, "testSetUp"):
-        integration_class.testSetUp()
-    portal = integration_class["portal"]
-    with site(portal):
-        yield portal
-    if hasattr(integration_class, "testTearDown"):
-        integration_class.testTearDown()

backend/tests/services/conftest.py

@@ -1,7 +1,6 @@
 from plone.app.testing import SITE_OWNER_NAME
 from plone.app.testing import SITE_OWNER_PASSWORD
 from plone.restapi.testing import RelativeSession
-from zope.component.hooks import site
 
 import pytest
 
@@ -12,14 +11,8 @@ def portal(functional):
 
 
 @pytest.fixture(scope="class")
-def portal_class(functional_class):
-    if hasattr(functional_class, "testSetUp"):
-        functional_class.testSetUp()
-    portal = functional_class["portal"]
-    with site(portal):
-        yield portal
-    if hasattr(functional_class, "testTearDown"):
-        functional_class.testTearDown()
+def portal_class(functional_portal_class):
+    yield functional_portal_class
 
 
 @pytest.fixture()

backend/tests/setup/test_setup_install.py

@@ -7,7 +7,7 @@
 
 class TestSetupInstall:
     @pytest.fixture(autouse=True)
-    def _setup(self, current_versions):
+    def _setup(self, current_versions) -> None:
         self.profile_version: str = current_versions.base
         self.dependencies_profile_version: str = current_versions.dependencies
 
@@ -59,14 +59,24 @@ def _setup(self, portal_class):
             "plone.volto:default",
             "plonetheme.barceloneta:default",
             "kitconcept.voltolighttheme:default",
-            "collective.volto.formsupport:default",
+            "plone.formblock:default",
             "plonegovbr.socialmedia:default",
         ],
     )
     def test_installed(self, profile: str):
         """Test if a profile is installed."""
         assert self.setup_tool.getLastVersionForProfile(profile) is not None
 
+    @pytest.mark.parametrize(
+        "profile",
+        [
+            "collective.volto.formsupport:default",
+        ],
+    )
+    def test_uninstalled(self, profile: str):
+        """Test if a profile is not installed."""
+        assert self.setup_tool.getLastVersionForProfile(profile) == "unknown"
+
     @pytest.mark.parametrize(
         "portal_type,title,klass",
         [

news/+vscode.internal

@@ -0,0 +1 @@
+Update `.vscode/settings.json`. @ericof