Merge branch 'main' into WikiPage-workspaces-example

Author: iFlameing

backend/news/550.bugfix

@@ -0,0 +1 @@
+Enable edit-time versioning (`at_edit_autoversion` policy) for the `WikiPage` and `Workspace` content types so their history view records an entry for every edit. @iFlameing

backend/src/kitconcept/intranet/profiles/default/metadata.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metadata>
-  <version>20260803001</version>
+  <version>20260804001</version>
   <dependencies>
     <dependency>plone.app.discussion:default</dependency>
     <dependency>profile-kitconcept.contactblock:default</dependency>

backend/src/kitconcept/intranet/profiles/default/repositorytool.xml

@@ -13,5 +13,13 @@
       <policy name="at_edit_autoversion" />
       <policy name="version_on_revert" />
     </type>
+    <type name="WikiPage">
+      <policy name="at_edit_autoversion" />
+      <policy name="version_on_revert" />
+    </type>
+    <type name="Workspace">
+      <policy name="at_edit_autoversion" />
+      <policy name="version_on_revert" />
+    </type>
   </policymap>
 </repositorytool>

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

@@ -96,5 +96,6 @@
   <include package=".v20260728001" />
   <include package=".v20260730001" />
   <include package=".v20260803001" />
+  <include package=".v20260804001" />
 
 </configure>

backend/src/kitconcept/intranet/upgrades/v20260804001/__init__.py

@@ -0,0 +1,15 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
+    >
+  <genericsetup:upgradeSteps
+      profile="kitconcept.intranet:default"
+      source="20260803001"
+      destination="20260804001"
+      >
+    <genericsetup:upgradeDepends
+        title="Enable edit-time versioning for WikiPage and Workspace content types"
+        import_steps="repositorytool"
+        />
+  </genericsetup:upgradeSteps>
+</configure>

backend/src/kitconcept/intranet/upgrades/v20260804001/configure.zcml

@@ -256,68 +256,6 @@ def _setup(self, portal, get_fti):
                     "kitconcept.intranet.content_review",
                 ),
             ),
-            ("Workspace", "title", "Workspace"),
-            ("Workspace", "description", "A folderish workspace container."),
-            ("Workspace", "allow_discussion", False),
-            ("Workspace", "global_allow", True),
-            ("Workspace", "filter_content_types", True),
-            (
-                "Workspace",
-                "allowed_content_types",
-                (
-                    "WikiPage",
-                    "File",
-                    "Image",
-                ),
-            ),
-            (
-                "Workspace",
-                "behaviors",
-                (
-                    "plone.basic",
-                    "volto.preview_image_link",
-                    "plone.categorization",
-                    "plone.publication",
-                    "plone.ownership",
-                    "plone.relateditems",
-                    "plone.shortname",
-                    "volto.navtitle",
-                    "plone.excludefromnavigation",
-                    "plone.allowdiscussion",
-                    "volto.blocks",
-                    "plone.constraintypes",
-                    "plone.namefromtitle",
-                    "plone.versioning",
-                    "plone.locking",
-                    "plone.translatable",
-                    "kitconcept.plate.workspace",
-                    "kitconcept.intranet.clm",
-                ),
-            ),
-            ("WikiPage", "title", "Wiki Page"),
-            (
-                "WikiPage",
-                "behaviors",
-                (
-                    "plone.basic",
-                    "volto.preview_image_link",
-                    "plone.categorization",
-                    "plone.publication",
-                    "plone.ownership",
-                    "plone.relateditems",
-                    "plone.shortname",
-                    "volto.navtitle",
-                    "plone.excludefromnavigation",
-                    "plone.allowdiscussion",
-                    "volto.blocks",
-                    "plone.constraintypes",
-                    "plone.namefromtitle",
-                    "plone.versioning",
-                    "plone.locking",
-                    "plone.translatable",
-                    "kitconcept.intranet.clm",
-                ),
-            ),
             ("Plone Site", "title", "Plone Site"),
             ("Plone Site", "klass", "Products.CMFPlone.Portal.PloneSite"),
             ("Plone Site", "global_allow", False),

backend/tests/content_types/test_fti.py

@@ -1,7 +1,6 @@
 from collections.abc import Generator
 from plone import api
 from plone.api.exc import InvalidParameterError
-from plone.app.testing.interfaces import SITE_OWNER_NAME
 from plone.dexterity.fti import DexterityFTI
 from Products.CMFPlone.Portal import PloneSite
 
@@ -14,13 +13,36 @@ def portal(app_class, create_site, answers) -> Generator[PloneSite]:
     yield site
 
 
-class TestWikiPage:
-    portal_type: str = "WikiPage"
+@pytest.fixture(scope="class")
+def portal_type() -> str:
+    return "WikiPage"
+
+
+@pytest.fixture(scope="class")
+def container(portal, content_factory):
+    """Return the container used to create the content instance under test."""
+    payload = {
+        "type": "Workspace",
+        "id": "my-workspace",
+    }
+    return content_factory(portal, payload)
+
+
+@pytest.fixture(scope="class")
+def payload(portal_type) -> dict:
+    return {
+        "type": portal_type,
+        "id": "my-other-wiki-page",
+        "title": "My other wiki page",
+        "description": "Description of my other wiki page",
+    }
+
 
+class TestWikiPage:
     @pytest.fixture(autouse=True)
-    def _setup(self, portal, get_fti) -> None:
+    def _setup(self, portal, get_fti, portal_type) -> None:
         self.portal = portal
-        self.fti: DexterityFTI = get_fti(self.portal_type)
+        self.fti: DexterityFTI = get_fti(portal_type)
 
     @pytest.mark.parametrize(
         "attr,expected",
@@ -44,8 +66,9 @@ def test_fti(self, attr: str, expected):
         assert isinstance(self.fti, DexterityFTI)
         assert getattr(self.fti, attr) == expected
 
-    def test_behaviors(self):
-        assert self.fti.behaviors == (
+    @pytest.mark.parametrize(
+        "idx,behavior",
+        enumerate((
             "plone.basic",
             "volto.preview_image_link",
             "plone.categorization",
@@ -63,27 +86,43 @@ def test_behaviors(self):
             "plone.locking",
             "plone.translatable",
             "kitconcept.intranet.clm",
-        )
+        )),
+    )
+    def test_behaviors(self, idx, behavior):
+        assert self.fti.behaviors[idx] == behavior
 
-    def test_wikipage_requires_workspace_container(self):
-        with api.env.adopt_user(SITE_OWNER_NAME):
+    def test_wikipage_requires_workspace_container(
+        self, site_owner_name, content_factory, portal_type, payload
+    ):
+        with api.env.adopt_user(site_owner_name):
             with pytest.raises(InvalidParameterError):
-                api.content.create(
-                    container=self.portal,
-                    type=self.portal_type,
-                    title="Root Wiki Page",
-                )
-
-            workspace = api.content.create(
-                container=self.portal,
-                type="Workspace",
-                title="Team Workspace",
-            )
-            page = api.content.create(
-                container=workspace,
-                type=self.portal_type,
-                title="Workspace Wiki Page",
+                content_factory(self.portal, payload)
+
+            workspace = content_factory(
+                self.portal,
+                {"type": "Workspace", "title": "Team Workspace"},
             )
+            page = content_factory(workspace, payload)
 
-        assert page.portal_type == self.portal_type
+        assert page.portal_type == portal_type
         assert page.aq_parent == workspace
+
+    def test_versionable(self, portal_type, versionable_content_types):
+        assert portal_type in versionable_content_types
+
+    def test_create_initial_version_after_adding(self, last_version, content_instance):
+        version = last_version(content_instance)
+        assert version.comment.default == "Initial version"
+        assert version.version_id == 0
+
+    def test_create_version_on_save(
+        self, notify_modified, history, last_version, content_instance
+    ):
+        with api.env.adopt_roles(["Manager"]):
+            content_instance.title = "Wiki Redux"
+            notify_modified(content_instance)
+        history_data = history(content_instance)
+        assert len(history_data) == 2  # Initial + modified version
+        version = last_version(content_instance)
+        assert version.comment is None
+        assert version.version_id == 1

backend/tests/content_types/test_wiki_page.py

@@ -0,0 +1,102 @@
+from collections.abc import Generator
+from plone import api
+from plone.dexterity.fti import DexterityFTI
+from Products.CMFPlone.Portal import PloneSite
+
+import pytest
+
+
+@pytest.fixture(scope="class")
+def portal(app_class, create_site, answers) -> Generator[PloneSite]:
+    site = create_site(app=app_class, answers=answers)
+    yield site
+
+
+@pytest.fixture(scope="class")
+def portal_type() -> str:
+    return "Workspace"
+
+
+@pytest.fixture(scope="class")
+def payload(portal_type) -> dict:
+    return {
+        "type": portal_type,
+        "id": "my-personal-workspace",
+        "title": "My personal workspace",
+        "description": "Description of my personal workspace",
+    }
+
+
+class TestWorkspace:
+    @pytest.fixture(autouse=True)
+    def _setup(self, portal, get_fti, portal_type) -> None:
+        self.portal = portal
+        self.fti: DexterityFTI = get_fti(portal_type)
+
+    @pytest.mark.parametrize(
+        "attr,expected",
+        [
+            ("title", "Workspace"),
+            ("factory", "Workspace"),
+            ("description", "A folderish workspace container."),
+            ("schema", "kitconcept.plate.content.workspace.IWorkspace"),
+            ("allow_discussion", False),
+            ("global_allow", True),
+            ("filter_content_types", True),
+            ("allowed_content_types", ("WikiPage", "File", "Image")),
+        ],
+    )
+    def test_fti(self, attr: str, expected):
+        assert isinstance(self.fti, DexterityFTI)
+        assert getattr(self.fti, attr) == expected
+
+    @pytest.mark.parametrize(
+        "idx,behavior",
+        (
+            enumerate((
+                "plone.basic",
+                "volto.preview_image_link",
+                "plone.categorization",
+                "plone.publication",
+                "plone.ownership",
+                "plone.relateditems",
+                "plone.shortname",
+                "volto.navtitle",
+                "plone.excludefromnavigation",
+                "plone.allowdiscussion",
+                "volto.blocks",
+                "plone.constraintypes",
+                "plone.namefromtitle",
+                "plone.versioning",
+                "plone.locking",
+                "plone.translatable",
+                "kitconcept.plate.workspace",
+            ))
+        ),
+    )
+    def test_behaviors(self, idx, behavior):
+        assert self.fti.behaviors[idx] == behavior
+
+    def test_workspace_creation(self, content_instance, portal_type):
+        assert content_instance.portal_type == portal_type
+        assert content_instance.aq_parent == self.portal
+
+    def test_versionable(self, portal_type, versionable_content_types):
+        assert portal_type in versionable_content_types
+
+    def test_create_initial_version_after_adding(self, last_version, content_instance):
+        version = last_version(content_instance)
+        assert version.comment.default == "Initial version"
+        assert version.version_id == 0
+
+    def test_create_version_on_save(
+        self, notify_modified, history, last_version, content_instance
+    ):
+        with api.env.adopt_roles(["Manager"]):
+            content_instance.title = "Workspace Redux"
+            notify_modified(content_instance)
+        history_data = history(content_instance)
+        assert len(history_data) == 2  # Initial + modified version
+        version = last_version(content_instance)
+        assert version.comment is None
+        assert version.version_id == 1