Merge branch 'main' into bug_60433_traduzioni_control_panel

CHANGES.rst

@@ -1,13 +1,22 @@
 Changelog
 =========
 
-6.2.25 (unreleased)
--------------------
+6.3.1 (unreleased)
+------------------
 
 - Update it translations
   [lucabel]
 
 
+6.3.0 (2024-12-05)
+------------------
+
+- Add dependency with collective.volto.blocksfield >= 2.2.0 and install it to have all blocks indexed in block_types index.
+  [cekk]
+- Do not use eea.api.taxonomy because it is deprecated.
+  [cekk]
+
+
 6.2.24 (2024-11-26)
 -------------------
 

setup.py

@@ -16,7 +16,7 @@
 
 setup(
     name="design.plone.contenttypes",
-    version="6.2.25.dev0",
+    version="6.3.1.dev0",
     description="DesignItalia contenty types",
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -58,14 +58,14 @@
         "plone.api>=1.8.4",
         "plone.app.dexterity>2.6.9",
         "collective.venue[geolocation]",
-        "collective.volto.blocksfield",
+        "collective.volto.blocksfield>=2.2.0",
         "collective.z3cform.datagridfield",
         "plone.formwidget.geolocation",
         "redturtle.volto>=5.5.3",
         "redturtle.bandi",
         "z3c.unconfigure",
         "plone.restapi",
-        "eea.api.taxonomy",
+        "collective.taxonomy>=3.1",
         "openpyxl",
         "collective.volto.enhancedlinks",
     ],

src/design/plone/contenttypes/browser/bando.py

@@ -34,7 +34,6 @@
 
 @implementer(IBandoView)
 class BandoView(BaseBandoView):
-
     def retrieveContentsOfFolderDeepening(self, path_dfolder):
         """Retrieves all objects contained in Folder Deppening"""
 

src/design/plone/contenttypes/configure.zcml

@@ -65,6 +65,13 @@
       directory="profiles/fix_syndication"
       />
 
+  <genericsetup:registerProfile
+      name="remove_eea_api_taxonomy"
+      title="Uninstall eea.api.taxonomy"
+      description=""
+      provides="Products.GenericSetup.interfaces.EXTENSION"
+      directory="profiles/remove_eea_api_taxonomy"
+      />
   <utility
       factory=".setuphandlers.HiddenProfiles"
       name="design.plone.contenttypes-hiddenprofiles"

src/design/plone/contenttypes/overrides.zcml

@@ -23,6 +23,7 @@
              Products.ZCatalog.interfaces.IZCatalog"
         name="SearchableText"
         />
+
   </unconfigure>
 
 </configure>

src/design/plone/contenttypes/patches/configure.zcml

@@ -6,13 +6,4 @@
 
   <include package="collective.monkeypatcher" />
 
-  <monkey:patch
-      original="__call__"
-      replacement=".patches.eea_api_taxonomy_taxonomy_call"
-      class="collective.taxonomy.utility.Taxonomy"
-      description="Patch Taxonomy class caller"
-      order="2000"
-      preserveOriginal="true"
-      />
-
 </configure>

src/design/plone/contenttypes/patches/patches.py

@@ -1,11 +1 @@
 # -*- coding: utf-8 -*-
-from collective.taxonomy.vocabulary import Vocabulary
-
-
-def eea_api_taxonomy_taxonomy_call(self, context):
-    if not self.data:
-        return Vocabulary(self.name, {}, {}, {}, 2)
-
-    request = getattr(context, "REQUEST", None)
-    language = self.getCurrentLanguage(request)
-    return self.makeVocabulary(language)

src/design/plone/contenttypes/profiles/default/metadata.xml

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metadata>
-  <version>7308</version>
+  <version>7309</version>
   <dependencies>
     <dependency>profile-redturtle.bandi:default</dependency>
     <dependency>profile-collective.venue:default</dependency>
     <dependency>profile-redturtle.volto:default</dependency>
-    <dependency>profile-eea.api.taxonomy:default</dependency>
     <dependency>profile-collective.z3cform.datagridfield:default</dependency>
     <dependency>profile-design.plone.contenttypes:taxonomy</dependency>
     <dependency>profile-collective.volto.enhancedlinks:default</dependency>
+    <dependency>profile-collective.volto.blocksfield:default</dependency>
+    <dependency>profile-collective.taxonomy:default</dependency>
   </dependencies>
 </metadata>

src/design/plone/contenttypes/profiles/remove_eea_api_taxonomy/browserlayer.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layers>
+  <layer name="eea.api.taxonomy" remove="true" />
+</layers>

src/design/plone/contenttypes/restapi/serializers/dxfields.py

@@ -189,7 +189,6 @@ def get_item_children(item):
 
 @adapter(ITextLine, IServizio, IDesignPloneContenttypesLayer)
 class ServizioTextLineFieldSerializer(DefaultFieldSerializer):
-
     PERMISSION_TO_CHECK = "View"
     CHECK_CONTENT_TYPE = None
 

src/design/plone/contenttypes/testing.py

@@ -16,7 +16,6 @@
 import collective.volto.enhancedlinks
 import collective.z3cform.datagridfield
 import design.plone.contenttypes
-import eea.api.taxonomy
 import kitconcept.seo
 import plone.app.caching
 import plone.formwidget.geolocation
@@ -43,7 +42,6 @@ def setUpZope(self, app, configurationContext):
         )
         self.loadZCML(package=redturtle.bandi)
         self.loadZCML(package=kitconcept.seo)
-        self.loadZCML(package=eea.api.taxonomy)
         self.loadZCML(package=collective.taxonomy)
         self.loadZCML(package=collective.z3cform.datagridfield)
 
@@ -75,7 +73,6 @@ def setUpZope(self, app, configurationContext):
         self.loadZCML(package=collective.volto.enhancedlinks)
         self.loadZCML(package=design.plone.contenttypes, context=configurationContext)
         self.loadZCML(package=plone.formwidget.geolocation)
-        self.loadZCML(package=eea.api.taxonomy)
         self.loadZCML(package=collective.taxonomy)
         self.loadZCML(package=collective.z3cform.datagridfield)
         xmlconfig.file(

src/design/plone/contenttypes/upgrades/configure.zcml

@@ -912,4 +912,13 @@
       destination="7308"
       handler=".to_730x.to_7308"
       />
+
+  <genericsetup:upgradeStep
+      title="Uninstall eea.api.taxonomy and install collective.volto.blocksfield"
+      profile="design.plone.contenttypes:default"
+      source="7308"
+      destination="7309"
+      handler=".to_730x.to_7309"
+      />
+
 </configure>

src/design/plone/contenttypes/upgrades/to_730x.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from plone.app.upgrade.utils import installOrReinstallProduct
 from design.plone.contenttypes.events.common import SUBFOLDERS_MAPPING
 from design.plone.contenttypes.utils import create_default_blocks
 from plone import api
@@ -158,3 +159,14 @@ def to_7308(context):
         if i % 15 == 0:
             logger.info("Progress: {}/{}".format(i, tot))
         brain.getObject().reindexObject(idxs=["effectivestart"])
+
+
+def to_7309(context):
+    logger.info("Uninstall eea.api.taxonomy")
+    ps = api.portal.get_tool(name="portal_setup")
+    ps.runAllImportStepsFromProfile(
+        "profile-design.plone.contenttypes:remove_eea_api_taxonomy"
+    )
+    ps.unsetLastVersionForProfile("eea.api.taxonomy:default")
+    logger.info("Install blocksfield")
+    installOrReinstallProduct(api.portal.get(), "collective.volto.blocksfield")

test-6.0.x.cfg

@@ -6,3 +6,5 @@ extends =
     base.cfg
 
 [versions]
+collective.volto.blocksfield = 2.2.0
+collective.taxonomy = 3.1.5