Merge pull request #11 from eea/develop

Release 2.0

docs/HISTORY.txt

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+2.0 - (2023-04-10)
+---------------------------
+* Bug fix: RestAPI fix DateTime timezone for publication fields serializer/deserializer
+  [avoinea refs #250368]
+* Cleanup: Drop Python2/Plone4 support
+  [avoinea refs #250368]
+
 1.7 - (2021-11-23)
 ---------------------------
 * Change: Removed types already present in plone.volto

eea/volto/policy/configure.zcml

@@ -7,11 +7,10 @@
   <i18n:registerTranslations directory="locales" />
 
   <include package="plone.volto" />
-
-  <include file="patches.zcml" />
   <include file="profiles.zcml" />
 
   <include package=".behaviors" />
+  <include package=".restapi" />
   <include package=".vocabularies" />
   <include package=".upgrades" />
 

eea/volto/policy/interfaces.py

@@ -1,21 +1,7 @@
 # -*- coding: utf-8 -*-
 """Module where all interfaces, events and exceptions live."""
-from eea.volto.policy import EEAMessageFactory as _
-from zope import schema
-from zope.interface import Interface
 from zope.publisher.interfaces.browser import IDefaultBrowserLayer
 
 
 class IEeaVoltoPolicyLayer(IDefaultBrowserLayer):
     """Marker interface that defines a browser layer."""
-
-
-class IVoltoSettings(Interface):
-    """Volto settings necessary to store in the backend"""
-
-    frontend_domain = schema.URI(
-        title=u"Frontend domain",
-        description=_(u"Used for rewriting URL's sent in thepassword reset "
-                      u"e-mail by Plone."),
-        default="http://localhost:3000",
-    )

eea/volto/policy/profiles.zcml

@@ -8,7 +8,6 @@
   <five:registerPackage package="." initialize=".initialize" />
 
   <genericsetup:registerProfile
-      zcml:condition="have plone-5"
       name="default"
       title="eea.volto.policy"
       directory="profiles/default"
@@ -17,16 +16,6 @@
       post_handler=".setuphandlers.post_install"
       />
 
-  <genericsetup:registerProfile
-      zcml:condition="not-have plone-5"
-      name="default"
-      title="eea.volto.policy"
-      directory="profiles/plone4"
-      description="Installs the eea.volto.policy add-on."
-      provides="Products.GenericSetup.interfaces.EXTENSION"
-      post_handler=".setuphandlers.post_install"
-      />
-
   <genericsetup:registerProfile
       name="uninstall"
       title="eea.volto.policy (uninstall)"

eea/volto/policy/profiles/default/metadata.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metadata>
-  <version>1.0</version>
+  <version>2.0</version>
   <dependencies>
     <dependency>profile-plone.volto:default</dependency>
   </dependencies>

eea/volto/policy/restapi/__init__.py

@@ -0,0 +1,2 @@
+""" RestAPI
+"""

eea/volto/policy/restapi/configure.zcml

@@ -0,0 +1,5 @@
+<configure xmlns="http://namespaces.zope.org/zope">
+  <include package="plone.restapi" />
+  <include package=".deserializer" />
+  <include package=".serializer" />
+</configure>

eea/volto/policy/restapi/deserializer/__init__.py

@@ -0,0 +1,2 @@
+""" RestAPI deserializer
+"""

eea/volto/policy/restapi/deserializer/configure.zcml

@@ -0,0 +1,8 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    i18n_domain="plone.restapi"
+    >
+
+  <adapter factory=".dxfields.DatetimeFieldDeserializer" />
+
+</configure>

eea/volto/policy/restapi/deserializer/dxfields.py

@@ -0,0 +1,66 @@
+""" DXFields
+"""
+import dateutil
+from pytz import timezone, utc
+from eea.volto.policy.interfaces import IEeaVoltoPolicyLayer
+from plone.app.dexterity.behaviors.metadata import IPublication
+from plone.app.event.base import default_timezone
+from plone.dexterity.interfaces import IDexterityContent
+from plone.restapi.deserializer.dxfields import \
+    DatetimeFieldDeserializer as DefaultDatetimeFieldDeserializer
+from plone.restapi.interfaces import IFieldDeserializer
+from z3c.form.interfaces import IDataManager
+from zope.component import adapter, queryMultiAdapter
+from zope.interface import implementer
+from zope.schema.interfaces import IDatetime
+
+
+@implementer(IFieldDeserializer)
+@adapter(IDatetime, IDexterityContent, IEeaVoltoPolicyLayer)
+class DatetimeFieldDeserializer(DefaultDatetimeFieldDeserializer):
+    """ DatetimeFieldDeserializer
+    """
+    def __call__(self, value):
+        # PATCH
+        is_publication_field = self.field.interface == IPublication
+        if is_publication_field:
+            # because IPublication datamanager strips timezones
+            tzinfo = timezone(default_timezone())
+        else:
+            dm = queryMultiAdapter((self.context, self.field), IDataManager)
+            current = dm.get()
+            if current is not None:
+                tzinfo = current.tzinfo
+            else:
+                tzinfo = None
+        # END OF PATCH
+
+        # This happens when a 'null' is posted for a non-required field.
+        if value is None:
+            self.field.validate(value)
+            return value
+
+        # Parse ISO 8601 string with dateutil
+        dt = dateutil.parser.parse(value)
+
+        # Convert to TZ aware in UTC
+        if dt.tzinfo is not None:
+            dt = dt.astimezone(utc)
+        else:
+            dt = utc.localize(dt)
+
+        # Convert to local TZ aware or naive UTC
+        if tzinfo is not None:
+            tz = timezone(tzinfo.zone)
+            value = tz.normalize(dt.astimezone(tz))
+        else:
+            value = utc.normalize(dt.astimezone(utc)).replace(tzinfo=None)
+
+        # if it's an IPublication field, remove timezone
+        # info to not break field validation
+        # PATCH
+        if is_publication_field:
+            value = value.replace(tzinfo=None)
+        # END OF PATCH
+        self.field.validate(value)
+        return value

eea/volto/policy/restapi/serializer/__init__.py

@@ -0,0 +1,2 @@
+""" RestAPI serializer
+"""

eea/volto/policy/restapi/serializer/configure.zcml

@@ -0,0 +1,8 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    i18n_domain="plone.restapi"
+    >
+
+  <adapter factory=".dxfields.DateTimeFieldSerializer" />
+
+</configure>