Fix serializer block with anchors, remove trailing slash before the anchor

news/1748.bugfix

@@ -0,0 +1 @@
+Fixed an edge case in the blocks resolveuid transforms with a trailing slash before a fragment. @sneridagh 

src/plone/restapi/deserializer/utils.py

@@ -31,7 +31,7 @@ def path2uid(context, link):
     suffix = ""
     match = PATH_RE.match(path)
     if match is not None:
-        path = match.group(1)
+        path = match.group(1).rstrip("/")
         suffix = match.group(2) or ""
 
     obj = portal.unrestrictedTraverse(path, None)

src/plone/restapi/serializer/utils.py

@@ -8,7 +8,7 @@
 import re
 
 
-RESOLVEUID_RE = re.compile("^(?:|.*/)resolve[Uu]id/([^/#]*)/?(.*)?$")
+RESOLVEUID_RE = re.compile("^(?:|.*/)resolve[Uu]id/([^/#]*)?(.*)?$")
 
 
 def resolve_uid(path):
@@ -29,7 +29,7 @@ def resolve_uid(path):
         return path, None
     href = brain.getURL()
     if suffix:
-        return href + "/" + suffix, brain
+        return href + suffix, brain
     target_object = brain._unrestrictedGetObject()
     adapter = queryMultiAdapter(
         (target_object, target_object.REQUEST),

src/plone/restapi/tests/test_blocks_deserializer.py

@@ -535,6 +535,36 @@ def test_slate_simple_link_deserializer_with_suffix_and_anchor(self):
             link, f"../resolveuid/{self.image.UID()}/@@download/file#anchor-id"
         )
 
+    def test_slate_simple_link_deserializer_with_slash_and_anchor(self):
+        blocks = {
+            "abc": {
+                "@type": "slate",
+                "plaintext": "Frontpage content here",
+                "value": [
+                    {
+                        "children": [
+                            {"text": "Frontpage "},
+                            {
+                                "children": [{"text": "content "}],
+                                "data": {
+                                    "url": "%s/image-1/#anchor-id"
+                                    % self.portal.absolute_url()
+                                },
+                                "type": "link",
+                            },
+                            {"text": "here"},
+                        ],
+                        "type": "h2",
+                    }
+                ],
+            }
+        }
+
+        res = self.deserialize(blocks=blocks)
+        value = res.blocks["abc"]["value"]
+        link = value[0]["children"][1]["data"]["url"]
+        self.assertEqual(link, f"../resolveuid/{self.image.UID()}#anchor-id")
+
     def test_aquisition_messing_with_link_deserializer(self):
         self.portal.invokeFactory(
             "Folder",

src/plone/restapi/tests/test_blocks_serializer.py

@@ -318,7 +318,7 @@ def test_simple_link_serializer_with_anchor(self):
         )
         value = res["abc"]["value"]
         link = value[0]["children"][1]["data"]["url"]
-        self.assertEqual(link, f"{self.portal['doc1'].absolute_url()}/#anchor-id")
+        self.assertEqual(link, f"{self.portal['doc1'].absolute_url()}#anchor-id")
 
     def test_simple_link_serializer_with_suffix(self):
         doc_uid = IUUID(self.portal["doc1"])