Skip to content

improve extensibility and optimize stored data #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

improve extensibility and optimize stored data #21

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3222df4
improve extensibility and optimize stored data
cekk Nov 9, 2021
a4bb46e
remove pdb
cekk Nov 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 38 additions & 12 deletions src/plone/volto/transforms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@
from zope.interface import implementer
from zope.publisher.interfaces.browser import IBrowserRequest
from zope.component import subscribers
from plone.restapi.serializer.utils import RESOLVEUID_RE
from plone.restapi.interfaces import IObjectPrimaryFieldTarget
from zope.component import getMultiAdapter
from plone.restapi.interfaces import ISerializeToJsonSummary
from plone.restapi.interfaces import ISerializeToJson
from plone.outputfilters.browser.resolveuid import uuidToObject


class NestedResolveUIDDeserializerBase(object):
Expand All @@ -22,6 +28,9 @@ class NestedResolveUIDDeserializerBase(object):
order = 1
block_type = None

columns = ["columns", "hrefList", "slides"]
fields = ["url", "href", "preview_image"]

def __init__(self, context, request):
self.context = context
self.request = request
Expand All @@ -44,11 +53,11 @@ def _transform(self, block):
return block

def __call__(self, block):
for column_name in ["columns", "hrefList", "slides"]:
for column_name in self.columns:
column_field = block.get(column_name, [])
if block.get(column_name, False):
for index, item in enumerate(column_field):
for field in ["url", "href", "preview_image"]:
for field in self.fields:
link = item.get(field, "")
if link and isinstance(link, string_types):
block[column_name][index][field] = path2uid(
Expand All @@ -63,10 +72,11 @@ def __call__(self, block):
):
result = []
for itemlink in link:
item_clone = deepcopy(itemlink)
item_clone["@id"] = path2uid(
context=self.context, link=item_clone["@id"]
)
item_clone = {
"@id": path2uid(
context=self.context, link=itemlink["@id"]
)
}
result.append(item_clone)

block[column_name][index][field] = result
Expand Down Expand Up @@ -99,6 +109,9 @@ class NestedResolveUIDSerializerBase(object):
order = 1
block_type = None

columns = ["columns", "hrefList", "slides"]
fields = ["url", "href", "preview_image"]

def __init__(self, context, request):
self.context = context
self.request = request
Expand All @@ -121,11 +134,11 @@ def _transform(self, block):
return block

def __call__(self, value):
for column_name in ["columns", "hrefList", "slides"]:
for column_name in self.columns:
column_field = value.get(column_name, [])
if value.get(column_name, False):
for index, item in enumerate(column_field):
for field in ["url", "href", "preview_image"]:
for field in self.fields:
if field in item.keys():
link = item.get(field, "")
if isinstance(link, string_types):
Expand All @@ -138,11 +151,9 @@ def __call__(self, value):
):
result = []
for itemlink in link:
item_clone = deepcopy(itemlink)
item_clone["@id"] = uid_to_url(
item_clone["@id"]
result.append(
self.resolveuid_to_obj(path=itemlink["@id"])
)
result.append(item_clone)

value[column_name][index][field] = result
else:
Expand All @@ -156,6 +167,21 @@ def __call__(self, value):

return value

def resolveuid_to_obj(self, path):
if not path:
return ""
match = RESOLVEUID_RE.match(path)
if match is None:
return path

uid, suffix = match.groups()
target_object = uuidToObject(uid)
if target_object is None:
return {"@id": path}
if target_object.portal_type == "image":
return getMultiAdapter((target_object, self.request), ISerializeToJson)()
return getMultiAdapter((target_object, self.request), ISerializeToJsonSummary)()


@adapter(IBlocks, IBrowserRequest)
@implementer(IBlockFieldDeserializationTransformer)
Expand Down