Merge branch 'main' into teaser-dynamic

docs/source/endpoints/comments.md

@@ -9,7 +9,12 @@ myst:
 
 # Comments
 
-Plone offers to users a feature to post comments on any content object with `plone.app.discussion`.
+```{versionchanged} Plone 6.1
+Discussion is disabled by default in Plone 6.1 and later.
+To enable discussion, see the Plone 6.1 upgrade guide section {ref}`backend-upgrade-plone-v61-discussion-label`.
+```
+
+Discussion is a feature that allows your site visitors to comment on web pages for any content object.
 
 Commenting can be enabled globally for specific content types and for single content objects.
 

news/1781.bugfix

@@ -0,0 +1 @@
+Make plone.app.discussion an optional dependency (core add-on) [@jensens]

setup.py

@@ -44,6 +44,7 @@ def read(filename):
     "plone.app.caching",
     "plone.app.contenttypes[test]",
     "plone.app.iterate",
+    "plone.app.discussion[test]",
     "plone.app.testing",
     "plone.app.upgrade",
     "plone.api",

src/plone/restapi/serializer/configure.zcml

@@ -115,8 +115,10 @@
 
   <adapter factory=".registry.SerializeRegistryToJson" />
 
-  <adapter factory=".discussion.ConversationSerializer" />
-  <adapter factory=".discussion.CommentSerializer" />
+  <configure zcml:condition="installed plone.app.discussion">
+    <adapter factory=".discussion.ConversationSerializer" />
+    <adapter factory=".discussion.CommentSerializer" />
+  </configure>
 
   <include package=".controlpanels" />
 

src/plone/restapi/services/configure.zcml

@@ -18,7 +18,10 @@
   <include package=".controlpanels" />
   <include package=".copymove" />
   <include package=".database" />
-  <include package=".discussion" />
+  <include
+      package=".discussion"
+      zcml:condition="installed plone.app.discussion"
+      />
   <include package=".groups" />
   <include package=".navigation" />
   <include package=".contextnavigation" />

src/plone/restapi/testing.py

@@ -135,6 +135,9 @@ def setUpPloneSite(self, portal):
 
         set_supported_languages(portal)
 
+        if portal.portal_setup.profileExists("plone.app.discussion:default"):
+            applyProfile(portal, "plone.app.discussion:default")
+
         applyProfile(portal, "plone.restapi:default")
         applyProfile(portal, "plone.restapi:testing")
         add_catalog_indexes(portal, DX_TYPES_INDEXES)

src/plone/restapi/tests/statictime.py

@@ -1,14 +1,18 @@
 from datetime import datetime
 from datetime import timezone
 from DateTime import DateTime
-from plone.app.discussion.comment import Comment
 from plone.app.layout.viewlets.content import ContentHistoryViewlet
 from plone.dexterity.content import DexterityContent
 from plone.locking.lockable import TTWLockable
 from plone.restapi.serializer.working_copy import WorkingCopyInfo
 from Products.CMFCore.WorkflowTool import _marker
 from Products.CMFCore.WorkflowTool import WorkflowTool
 
+try:
+    from plone.app.discussion.comment import Comment
+except ImportError:
+    Comment = None
+
 
 _originals = {
     "WorkflowTool.getInfoFor": WorkflowTool.getInfoFor,
@@ -106,19 +110,21 @@ def start(self):
         DexterityContent.modification_date = property(
             static_modification_date_getter_factory(self.static_modified), nop_setter
         )
-
-        # Patch the lightweight p.a.discussion 'Comment' type. Its dates are
-        # Python datetimes, unlike DX Content types which use zope DateTimes.
-        Comment.creation_date = property(
-            static_creation_date_getter_factory(self.static_created, type_=datetime),
-            nop_setter,
-        )
-        Comment.modification_date = property(
-            static_modification_date_getter_factory(
-                self.static_modified, type_=datetime
-            ),
-            nop_setter,
-        )
+        if Comment is not None:
+            # Patch the lightweight p.a.discussion 'Comment' type. Its dates are
+            # Python datetimes, unlike DX Content types which use zope DateTimes.
+            Comment.creation_date = property(
+                static_creation_date_getter_factory(
+                    self.static_created, type_=datetime
+                ),
+                nop_setter,
+            )
+            Comment.modification_date = property(
+                static_modification_date_getter_factory(
+                    self.static_modified, type_=datetime
+                ),
+                nop_setter,
+            )
 
         WorkflowTool.getInfoFor = static_get_info_for_factory(self.static_modified)
 
@@ -138,8 +144,9 @@ def stop(self):
         ]
         WorkflowTool.getInfoFor = _originals["WorkflowTool.getInfoFor"]
 
-        Comment.modification_date = None
-        Comment.creation_date = None
+        if Comment is not None:
+            Comment.modification_date = None
+            Comment.creation_date = None
 
         WorkingCopyInfo.created = _originals["WorkingCopyInfo.created"]
 

src/plone/restapi/tests/test_statictime.py

@@ -299,10 +299,6 @@ def setUp(self):
 
         setRoles(self.portal, TEST_USER_ID, ["Manager"])
 
-        registry = getUtility(IRegistry)
-        settings = registry.forInterface(IDiscussionSettings, check=False)
-        settings.globally_enabled = True
-
         transaction.commit()
 
     def create_document(self, id_):