imio.smartweb.common 1.2.1__tar.gz → 1.2.3__tar.gz

{imio.smartweb.common-1.2.1 → imio.smartweb.common-1.2.3}/CHANGES.rst

@@ -2,6 +2,31 @@ Changelog
 =========
 
 
+1.2.3 (2023-11-21)
+------------------
+
+- Improve image compression quality
+  [laulaz]
+
+- Change portrait scales dimensions
+  [laulaz]
+
+
+1.2.2 (2023-11-20)
+------------------
+
+- Fix missing values for facilities lists (causing `None` in REST views filters)
+  See https://github.com/collective/collective.solr/issues/366
+  [laulaz]
+
+- Fix last upgrade steps: when run from command line, we need to adopt admin
+  user to find private objects
+  [laulaz]
+
+- WEB-4003 : Fix missing TextField mimetypes
+  [laulaz]
+
+
 1.2.1 (2023-10-29)
 ------------------
 

{imio.smartweb.common-1.2.1 → imio.smartweb.common-1.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imio.smartweb.common
-Version: 1.2.1
+Version: 1.2.3
 Summary: Common utilities, vocabularies, taxonomies for imio.smartweb & co products
 Home-page: https://github.com/imio/imio.smartweb.common
 Author: iMio
@@ -10,7 +10,6 @@ Project-URL: PyPI, https://pypi.python.org/pypi/imio.smartweb.common
 Project-URL: Source, https://github.com/imio/imio.smartweb.common
 Project-URL: Tracker, https://github.com/imio/imio.smartweb.common/issues
 Keywords: Python Plone CMS
-Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Plone
@@ -136,6 +135,31 @@ Changelog
 =========
 
 
+1.2.3 (2023-11-21)
+------------------
+
+- Improve image compression quality
+  [laulaz]
+
+- Change portrait scales dimensions
+  [laulaz]
+
+
+1.2.2 (2023-11-20)
+------------------
+
+- Fix missing values for facilities lists (causing `None` in REST views filters)
+  See https://github.com/collective/collective.solr/issues/366
+  [laulaz]
+
+- Fix last upgrade steps: when run from command line, we need to adopt admin
+  user to find private objects
+  [laulaz]
+
+- WEB-4003 : Fix missing TextField mimetypes
+  [laulaz]
+
+
 1.2.1 (2023-10-29)
 ------------------
 
@@ -477,5 +501,3 @@ Changelog
 
 - Initial release.
   [boulch]
-
-

{imio.smartweb.common-1.2.1 → imio.smartweb.common-1.2.3}/setup.py

@@ -16,7 +16,7 @@ long_description = "\n\n".join(
 
 setup(
     name="imio.smartweb.common",
-    version="1.2.1",
+    version="1.2.3",
     description="Common utilities, vocabularies, taxonomies for imio.smartweb & co products",
     long_description=long_description,
     # Get more from https://pypi.org/classifiers/

{imio.smartweb.common-1.2.1 → imio.smartweb.common-1.2.3}/src/imio/smartweb/common/behaviors/iam.py

@@ -18,6 +18,7 @@ class IAm(model.Schema):
             "Important! These categories are used to create lists accessible via the navigation menu"
         ),
         value_type=schema.Choice(vocabulary="imio.smartweb.vocabulary.IAm"),
+        default=[],
         required=False,
     )
     directives.widget(iam=SelectFieldWidget)

{imio.smartweb.common-1.2.1 → imio.smartweb.common-1.2.3}/src/imio/smartweb/common/behaviors/topics.py

@@ -18,6 +18,7 @@ class ITopics(model.Schema):
             "Important! Topics are used to filter search results and create lists"
         ),
         value_type=schema.Choice(vocabulary="imio.smartweb.vocabulary.Topics"),
+        default=[],
         required=False,
     )
     directives.widget(topics=SelectFieldWidget)

{imio.smartweb.common-1.2.1 → imio.smartweb.common-1.2.3}/src/imio/smartweb/common/profiles/default/metadata.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metadata>
-  <version>1020</version>
+  <version>1024</version>
   <dependencies>
     <dependency>profile-plone.restapi:default</dependency>
     <dependency>profile-eea.facetednavigation:default</dependency>

{imio.smartweb.common-1.2.1 → imio.smartweb.common-1.2.3}/src/imio/smartweb/common/profiles/default/registry.xml

@@ -11,9 +11,9 @@
       <element>paysage_affiche 750:448</element>
       <element>paysage_vignette 430:257</element>
       <element>paysage_liste 167:100</element>
-      <element>portrait_affiche 750:1060</element>
-      <element>portrait_vignette 430:608</element>
-      <element>portrait_liste 222:296</element>
+      <element>portrait_affiche 448:633</element>
+      <element>portrait_vignette 448:633</element>
+      <element>portrait_liste 222:313</element>
       <element>large 768:768</element>
       <element>preview 400:400</element>
       <element>mini 200:200</element>
@@ -24,6 +24,12 @@
     </value>
   </record>
 
+  <record name="plone.quality"
+          interface="plone.base.interfaces.controlpanel.IImagingSchema"
+          field="quality">
+    <value>92</value>
+  </record>
+
   <records prefix="plone.bundles/smartweb-common-view"
            interface='Products.CMFPlone.interfaces.IBundleRegistry'>
     <value key="enabled">True</value>

{imio.smartweb.common-1.2.1 → imio.smartweb.common-1.2.3}/src/imio/smartweb/common/subscribers.py

@@ -36,7 +36,13 @@ def added_content(obj, event):
             value = getattr(obj, name)
             if IRichTextValue.providedBy(value):
                 str = clean_invisible_char(value.raw)
-                setattr(obj, name, RichTextValue(str))
+                new_value = RichTextValue(
+                    str,
+                    mimeType=value.mimeType,
+                    outputMimeType=value.outputMimeType,
+                    encoding=value.encoding,
+                )
+                setattr(obj, name, new_value)
     reindex_breadcrumb(obj, event)
 
 
@@ -48,7 +54,13 @@ def modified_content(obj, event):
                 continue
             if IRichTextValue.providedBy(value):
                 str = clean_invisible_char(value.raw)
-                setattr(obj, name, RichTextValue(str))
+                new_value = RichTextValue(
+                    str,
+                    mimeType=value.mimeType,
+                    outputMimeType=value.outputMimeType,
+                    encoding=value.encoding,
+                )
+                setattr(obj, name, new_value)
     reindex_breadcrumb(obj, event)
 
 

{imio.smartweb.common-1.2.1 → imio.smartweb.common-1.2.3}/src/imio/smartweb/common/tests/test_text.py

@@ -34,6 +34,8 @@ class TestText(unittest.TestCase):
         document.text = text
         modified(document)
         self.assertEqual(document.text.raw, "<p>Kamoulox</p>")
+        self.assertEqual(document.text.mimeType, "text/html")
+        self.assertEqual(document.text.outputMimeType, "text/html")
 
         document = api.content.create(
             container=self.folder,

{imio.smartweb.common-1.2.1 → imio.smartweb.common-1.2.3}/src/imio/smartweb/common/upgrades/configure.zcml

@@ -92,6 +92,22 @@
       provides="Products.GenericSetup.interfaces.EXTENSION"
       />
 
+  <genericsetup:registerProfile
+      name="upgrade_1022_to_1023"
+      title="Upgrade common from 1022 to 1023"
+      directory="profiles/1022_to_1023"
+      description="Change portrait scales dimensions"
+      provides="Products.GenericSetup.interfaces.EXTENSION"
+      />
+
+  <genericsetup:registerProfile
+      name="upgrade_1023_to_1024"
+      title="Upgrade common from 1023 to 1024"
+      directory="profiles/1023_to_1024"
+      description="Improve image compression quality"
+      provides="Products.GenericSetup.interfaces.EXTENSION"
+      />
+
   <genericsetup:upgradeStep
       title="Configure first official release"
       description="Run needed registry step"
@@ -298,4 +314,40 @@
       profile="imio.smartweb.common:default"
       />
 
+  <genericsetup:upgradeStep
+      title="Restore missing textfields mimetypes"
+      source="1020"
+      destination="1021"
+      handler=".upgrades.restore_textfields_mimetypes"
+      profile="imio.smartweb.common:default"
+      />
+
+  <genericsetup:upgradeStep
+      title="Fix missing values for lists"
+      source="1021"
+      destination="1022"
+      handler=".upgrades.fix_missing_values_for_lists"
+      profile="imio.smartweb.common:default"
+      />
+
+  <genericsetup:upgradeSteps
+      source="1022"
+      destination="1023"
+      profile="imio.smartweb.common:default">
+    <genericsetup:upgradeDepends
+        title="Change portrait scales dimensions"
+        import_profile="imio.smartweb.common.upgrades:upgrade_1022_to_1023"
+        />
+  </genericsetup:upgradeSteps>
+
+  <genericsetup:upgradeSteps
+      source="1023"
+      destination="1024"
+      profile="imio.smartweb.common:default">
+    <genericsetup:upgradeDepends
+        title="Improve image compression quality"
+        import_profile="imio.smartweb.common.upgrades:upgrade_1023_to_1024"
+        />
+  </genericsetup:upgradeSteps>
+
 </configure>

imio.smartweb.common-1.2.3/src/imio/smartweb/common/upgrades/profiles/1022_to_1023/registry/scales.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<registry
+    xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+    i18n:domain="imio.smartweb">
+
+  <record name="plone.allowed_sizes"
+          interface="Products.CMFPlone.interfaces.controlpanel.IImagingSchema"
+          field="allowed_sizes">
+    <value purge="true">
+      <element>banner 1920:65536</element>
+      <element>paysage_affiche 750:448</element>
+      <element>paysage_vignette 430:257</element>
+      <element>paysage_liste 167:100</element>
+      <element>portrait_affiche 448:633</element>
+      <element>portrait_vignette 448:633</element>
+      <element>portrait_liste 222:313</element>
+      <element>large 768:768</element>
+      <element>preview 400:400</element>
+      <element>mini 200:200</element>
+      <element>thumb 128:128</element>
+      <element>tile 64:64</element>
+      <element>icon 32:32</element>
+      <element>listing 16:16</element>
+    </value>
+  </record>
+
+</registry>

imio.smartweb.common-1.2.3/src/imio/smartweb/common/upgrades/profiles/1023_to_1024/registry/scales.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<registry
+    xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+    i18n:domain="imio.smartweb">
+
+  <record name="plone.quality"
+          interface="plone.base.interfaces.controlpanel.IImagingSchema"
+          field="quality">
+    <value>92</value>
+  </record>
+
+</registry>

imio.smartweb.common-1.2.3/src/imio/smartweb/common/upgrades/upgrades.py

@@ -0,0 +1,131 @@
+# -*- coding: utf-8 -*-
+
+from plone import api
+from plone.app.imagecropping import PAI_STORAGE_KEY
+from plone.app.imagecropping.interfaces import IImageCroppingMarker
+from plone.app.textfield.value import IRichTextValue
+from plone.app.textfield.value import RichTextValue
+from plone.dexterity.utils import iterSchemata
+from zope.annotation.interfaces import IAnnotations
+from zope.schema import getFields
+
+import logging
+
+logger = logging.getLogger("imio.smartweb.common")
+PROFILEID = "profile-imio.smartweb.common:default"
+
+
+def reload_registry(context):
+    portal_setup = api.portal.get_tool("portal_setup")
+    portal_setup.runImportStepFromProfile(PROFILEID, "plone.app.registry")
+
+
+def reload_actions(context):
+    portal_setup = api.portal.get_tool("portal_setup")
+    portal_setup.runImportStepFromProfile(PROFILEID, "actions")
+
+
+def reindex_searchable_text(context):
+    portal_catalog = api.portal.get_tool("portal_catalog")
+    portal_catalog.manage_reindexIndex(ids=["SearchableText"])
+    logger.info("Reindexed SearchableText index")
+
+
+def upgrade_barceloneta(context):
+    portal_setup = api.portal.get_tool("portal_setup")
+    portal_setup.upgradeProfile("plonetheme.barceloneta:default")
+
+
+def remove_deprecated_cropping_annotations(context):
+    with api.env.adopt_user(username="admin"):
+        brains = api.content.find(object_provides=IImageCroppingMarker)
+        scales_to_delete = [
+            "affiche",
+            "extralarge",
+            "slide",
+            "medium",
+            "vignette",
+            "liste",
+        ]
+        for brain in brains:
+            obj = brain.getObject()
+            annotations = IAnnotations(obj)
+            scales = annotations.get(PAI_STORAGE_KEY)
+            if scales is None:
+                continue
+            deleted_scales = []
+            for scale in scales:
+                scale_name = scale.split("_")[-1]
+                if scale_name in scales_to_delete:
+                    deleted_scales.append(scale)
+
+            for scale in deleted_scales:
+                del scales[scale]
+            if deleted_scales:
+                obj.reindexObject()
+                logger.info(
+                    f'Remove deprecated scales : {",".join(deleted_scales)} cropping annotation on {obj.absolute_url()}'
+                )
+
+
+def restore_textfields_mimetypes(context):
+    with api.env.adopt_user(username="admin"):
+        brains = api.content.find(
+            portal_type=[
+                "imio.events.Event",
+                "imio.news.NewsItem",
+                "imio.smartweb.CirkwiView",
+                "imio.smartweb.DirectoryView",
+                "imio.smartweb.SectionText",
+            ]
+        )
+        for brain in brains:
+            obj = brain.getObject()
+            for schema in iterSchemata(obj):
+                for name, field in getFields(schema).items():
+                    value = getattr(obj, name)
+                    if not IRichTextValue.providedBy(value):
+                        continue
+                    new_value = RichTextValue(
+                        value.raw,
+                        mimeType="text/html",
+                        outputMimeType="text/x-html-safe",
+                        encoding="utf-8",
+                    )
+                    setattr(obj, name, new_value)
+                    logger.info(
+                        f"Fixed WYSIWYG field mimetypes on {obj.absolute_url()}"
+                    )
+
+
+def fix_missing_values_for_lists(context):
+    catalog = api.portal.get_tool("portal_catalog")
+    with api.env.adopt_user(username="admin"):
+        brains = api.content.find(
+            portal_type=[
+                "File",
+                "imio.directory.Contact",
+                "imio.events.Event",
+                "imio.news.NewsItem",
+                "imio.smartweb.CirkwiView",
+                "imio.smartweb.DirectoryView",
+                "imio.smartweb.EventsView",
+                "imio.smartweb.NewsView",
+                "imio.smartweb.Page",
+                "imio.smartweb.PortalPage",
+                "imio.smartweb.Procedure",
+                "imio.smartweb.SectionExternalContent",
+                "imio.smartweb.SectionGallery",
+                "imio.smartweb.SectionVideo",
+            ]
+        )
+        for brain in brains:
+            obj = brain.getObject()
+            if hasattr(obj, "topics") and obj.topics is None:
+                obj.topics = []
+                catalog.catalog_object(obj, idxs=["topics"])
+                logger.info(f"Fixed None list for Topics on {obj.absolute_url()}")
+            if hasattr(obj, "iam") and obj.iam is None:
+                obj.iam = []
+                catalog.catalog_object(obj, idxs=["iam"])
+                logger.info(f"Fixed None list for Iam on {obj.absolute_url()}")

{imio.smartweb.common-1.2.1 → imio.smartweb.common-1.2.3}/src/imio.smartweb.common.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imio.smartweb.common
-Version: 1.2.1
+Version: 1.2.3
 Summary: Common utilities, vocabularies, taxonomies for imio.smartweb & co products
 Home-page: https://github.com/imio/imio.smartweb.common
 Author: iMio
@@ -10,7 +10,6 @@ Project-URL: PyPI, https://pypi.python.org/pypi/imio.smartweb.common
 Project-URL: Source, https://github.com/imio/imio.smartweb.common
 Project-URL: Tracker, https://github.com/imio/imio.smartweb.common/issues
 Keywords: Python Plone CMS
-Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Plone
@@ -136,6 +135,31 @@ Changelog
 =========
 
 
+1.2.3 (2023-11-21)
+------------------
+
+- Improve image compression quality
+  [laulaz]
+
+- Change portrait scales dimensions
+  [laulaz]
+
+
+1.2.2 (2023-11-20)
+------------------
+
+- Fix missing values for facilities lists (causing `None` in REST views filters)
+  See https://github.com/collective/collective.solr/issues/366
+  [laulaz]
+
+- Fix last upgrade steps: when run from command line, we need to adopt admin
+  user to find private objects
+  [laulaz]
+
+- WEB-4003 : Fix missing TextField mimetypes
+  [laulaz]
+
+
 1.2.1 (2023-10-29)
 ------------------
 
@@ -477,5 +501,3 @@ Changelog
 
 - Initial release.
   [boulch]
-
-

{imio.smartweb.common-1.2.1 → imio.smartweb.common-1.2.3}/src/imio.smartweb.common.egg-info/SOURCES.txt

@@ -129,6 +129,8 @@ src/imio/smartweb/common/upgrades/profiles/1015_to_1016/registry/patched-faceted
 src/imio/smartweb/common/upgrades/profiles/1016_to_1017/registry/scales.xml
 src/imio/smartweb/common/upgrades/profiles/1017_to_1018/registry.xml
 src/imio/smartweb/common/upgrades/profiles/1018_to_1019/registry/scales.xml
+src/imio/smartweb/common/upgrades/profiles/1022_to_1023/registry/scales.xml
+src/imio/smartweb/common/upgrades/profiles/1023_to_1024/registry/scales.xml
 src/imio/smartweb/common/viewlets/__init__.py
 src/imio/smartweb/common/viewlets/analytics.pt
 src/imio/smartweb/common/viewlets/colophon.pt

imio.smartweb.common-1.2.1/src/imio/smartweb/common/upgrades/upgrades.py

@@ -1,56 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from plone import api
-from plone.app.imagecropping import PAI_STORAGE_KEY
-from plone.app.imagecropping.interfaces import IImageCroppingMarker
-from zope.annotation.interfaces import IAnnotations
-
-import logging
-
-logger = logging.getLogger("imio.smartweb.common")
-PROFILEID = "profile-imio.smartweb.common:default"
-
-
-def reload_registry(context):
-    portal_setup = api.portal.get_tool("portal_setup")
-    portal_setup.runImportStepFromProfile(PROFILEID, "plone.app.registry")
-
-
-def reload_actions(context):
-    portal_setup = api.portal.get_tool("portal_setup")
-    portal_setup.runImportStepFromProfile(PROFILEID, "actions")
-
-
-def reindex_searchable_text(context):
-    portal_catalog = api.portal.get_tool("portal_catalog")
-    portal_catalog.manage_reindexIndex(ids=["SearchableText"])
-    logger.info("Reindexed SearchableText index")
-
-
-def upgrade_barceloneta(context):
-    portal_setup = api.portal.get_tool("portal_setup")
-    portal_setup.upgradeProfile("plonetheme.barceloneta:default")
-
-
-def remove_deprecated_cropping_annotations(context):
-    brains = api.content.find(object_provides=IImageCroppingMarker)
-    scales_to_delete = ["affiche", "extralarge", "slide", "medium", "vignette", "liste"]
-    for brain in brains:
-        obj = brain.getObject()
-        annotations = IAnnotations(obj)
-        scales = annotations.get(PAI_STORAGE_KEY)
-        if scales is None:
-            continue
-        deleted_scales = []
-        for scale in scales:
-            scale_name = scale.split("_")[-1]
-            if scale_name in scales_to_delete:
-                deleted_scales.append(scale)
-
-        for scale in deleted_scales:
-            del scales[scale]
-        if deleted_scales:
-            obj.reindexObject()
-            logger.info(
-                f'Remove deprecated scales : {",".join(deleted_scales)} cropping annotation on {obj.absolute_url()}'
-            )