Rename iface name to the short name in blocks

news/838.bugfix

@@ -0,0 +1,2 @@
+Change to use the short name for the Blocks behavior instead of using the interface one. It fixes #838.
+[sneridagh]

src/plone/restapi/profiles/blocks/types/Document.xml

@@ -2,7 +2,7 @@
 <object name="Document" meta_type="Dexterity FTI" i18n:domain="plone"
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="behaviors" purge="false">
-  <element value="plone.restapi.behaviors.IBlocks" />
+  <element value="volto.blocks" />
  </property>
 
 </object>

src/plone/restapi/profiles/default/metadata.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <metadata>
-  <version>0005</version>
+  <version>0006</version>
 </metadata>

src/plone/restapi/tests/test_behaviors.py

@@ -23,7 +23,7 @@ def setUp(self):
         fti = DexterityFTI("blocksfolder")
         self.portal.portal_types._setObject("blocksfolder", fti)
         fti.klass = "plone.dexterity.content.Container"
-        fti.behaviors = ("plone.restapi.behaviors.IBlocks",)
+        fti.behaviors = ("volto.blocks",)
         self.fti = fti
         alsoProvides(self.request, IBlocks)
 

src/plone/restapi/tests/test_content_blocks.py

@@ -29,7 +29,7 @@ def setUp(self):
 
         fti = queryUtility(IDexterityFTI, name="Document")
         behavior_list = [a for a in fti.behaviors]
-        behavior_list.append("plone.restapi.behaviors.IBlocks")
+        behavior_list.append("volto.blocks")
         behavior_list.append("plone.leadimage")
         fti.behaviors = tuple(behavior_list)
 

src/plone/restapi/upgrades/configure.zcml

@@ -50,4 +50,13 @@
         profile="plone.restapi:default"
         />
 
+    <genericsetup:upgradeStep
+        title="Rename iface name to the short name in blocks"
+        description=""
+        source="0005"
+        destination="0006"
+        handler="plone.restapi.upgrades.to0006.rename_iface_to_name_in_blocks_behavior"
+        profile="plone.restapi:default"
+        />
+
 </configure>

src/plone/restapi/upgrades/to0005.py

@@ -9,7 +9,7 @@
 
 OLD_BEHAVIOR_NAME = "plone.restapi.behaviors.ITiles"
 SHORT_OLD_BEHAVIOR_NAME = "plone.tiles"
-NEW_BEHAVIOR_NAME = "plone.restapi.behaviors.IBlocks"
+SHORT_NEW_NAME = "volto.blocks"
 
 
 def rename_tiles_to_blocks(setup_context):
@@ -28,7 +28,7 @@ def rename_tiles_to_blocks(setup_context):
                 for currentbehavior in fti.behaviors
                 if currentbehavior != OLD_BEHAVIOR_NAME
             ]
-            new_fti.append(NEW_BEHAVIOR_NAME)
+            new_fti.append(SHORT_NEW_NAME)
             fti.behaviors = tuple(new_fti)
             logger.info("Migrated behavior of {} type".format(_type))
 
@@ -40,7 +40,7 @@ def rename_tiles_to_blocks(setup_context):
                 for currentbehavior in fti.behaviors
                 if currentbehavior != SHORT_OLD_BEHAVIOR_NAME
             ]
-            new_fti.append(NEW_BEHAVIOR_NAME)
+            new_fti.append(SHORT_NEW_NAME)
             fti.behaviors = tuple(new_fti)
             logger.info("Migrated behavior of {} type".format(_type))
 

src/plone/restapi/upgrades/to0006.py

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+from plone import api
+from zope.component import queryUtility
+from plone.dexterity.interfaces import IDexterityFTI
+
+import logging
+
+logger = logging.getLogger(__name__)
+
+DEPRECATED_NEW_BEHAVIOR_NAME = "plone.restapi.behaviors.IBlocks"
+SHORT_NEW_NAME = "volto.blocks"
+
+
+def rename_iface_to_name_in_blocks_behavior(setup_context):
+    """Rename iface name to the short name in blocks
+    """
+    pt = api.portal.get_tool("portal_types")
+
+    for _type in pt.objectIds():
+        fti = queryUtility(IDexterityFTI, name=_type)
+        if fti and DEPRECATED_NEW_BEHAVIOR_NAME in fti.behaviors:
+            new_fti = [
+                currentbehavior
+                for currentbehavior in fti.behaviors
+                if currentbehavior != DEPRECATED_NEW_BEHAVIOR_NAME
+            ]
+            new_fti.append(SHORT_NEW_NAME)
+            fti.behaviors = tuple(new_fti)
+            logger.info("Migrated behavior of {} type".format(_type))