imio.smartweb.core 1.1.23__tar.gz → 1.1.25__tar.gz

{imio.smartweb.core-1.1.23 → imio.smartweb.core-1.1.25}/CHANGES.rst

@@ -2,6 +2,29 @@ Changelog
 =========
 
 
+1.1.25 (2023-10-09)
+-------------------
+
+- SUP-32169 : Add new external content plugins : ArcgisPlugin
+  [boulch]
+
+
+1.1.24 (2023-10-09)
+-------------------
+
+- WEB-3986 : Fix : email must be open thank to "mailto:" tag instead of "tel:"
+  [boulch]
+
+- WEB-3984 : Remove deprecated cropping annotations on banner
+  [boulch, laulaz]
+
+- WEB-3984 : Don't get banner scale anymore. Get full banner image directly
+  [boulch, laulaz]
+
+- WEB-3984 : Remove banner field from cropping editor
+  [laulaz]
+
+
 1.1.23 (2023-09-06)
 -------------------
 

{imio.smartweb.core-1.1.23 → imio.smartweb.core-1.1.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imio.smartweb.core
-Version: 1.1.23
+Version: 1.1.25
 Summary: Core product for iMio websites
 Home-page: https://github.com/imio/imio.smartweb.core
 Author: Christophe Boulanger
@@ -158,6 +158,29 @@ Changelog
 =========
 
 
+1.1.25 (2023-10-09)
+-------------------
+
+- SUP-32169 : Add new external content plugins : ArcgisPlugin
+  [boulch]
+
+
+1.1.24 (2023-10-09)
+-------------------
+
+- WEB-3986 : Fix : email must be open thank to "mailto:" tag instead of "tel:"
+  [boulch]
+
+- WEB-3984 : Remove deprecated cropping annotations on banner
+  [boulch, laulaz]
+
+- WEB-3984 : Don't get banner scale anymore. Get full banner image directly
+  [boulch, laulaz]
+
+- WEB-3984 : Remove banner field from cropping editor
+  [laulaz]
+
+
 1.1.23 (2023-09-06)
 -------------------
 

{imio.smartweb.core-1.1.23 → imio.smartweb.core-1.1.25}/setup.py

@@ -16,7 +16,7 @@ long_description = "\n\n".join(
 
 setup(
     name="imio.smartweb.core",
-    version="1.1.23",
+    version="1.1.25",
     description="Core product for iMio websites",
     long_description=long_description,
     # Get more from https://pypi.org/classifiers/

imio.smartweb.core-1.1.25/src/imio/smartweb/core/contents/__init__.py

@@ -0,0 +1,59 @@
+from .blocks.link.content import BlockLink  # NOQA
+from .blocks.link.content import IBlockLink  # NOQA
+from .pages.pages import IDefaultPages  # NOQA
+from .pages.pages import IPages  # NOQA
+from .pages.pages import Pages  # NOQA
+from .folder.content import Folder  # NOQA
+from .folder.content import IFolder  # NOQA
+from .pages.cirkwi.content import CirkwiView  # NOQA
+from .pages.cirkwi.content import ICirkwiView  # NOQA
+from .pages.footer.content import Footer  # NOQA
+from .pages.footer.content import IFooter  # NOQA
+from .pages.herobanner.content import HeroBanner  # NOQA
+from .pages.herobanner.content import IHeroBanner  # NOQA
+from .pages.page.content import IPage  # NOQA
+from .pages.page.content import Page  # NOQA
+from .pages.portal_page.content import IPortalPage  # NOQA
+from .pages.portal_page.content import PortalPage  # NOQA
+from .pages.procedure.content import IProcedure  # NOQA
+from .pages.procedure.content import Procedure  # NOQA
+from .rest.directory.content import DirectoryView  # NOQA
+from .rest.directory.content import IDirectoryView  # NOQA
+from .rest.events.content import EventsView  # NOQA
+from .rest.events.content import IEventsView  # NOQA
+from .rest.news.content import INewsView  # NOQA
+from .rest.news.content import NewsView  # NOQA
+from .sections.base import ISection  # NOQA
+from .sections.base import Section  # NOQA
+from .sections.collection.content import ISectionCollection  # NOQA
+from .sections.collection.content import SectionCollection  # NOQA
+from .sections.contact.content import ISectionContact  # NOQA
+from .sections.contact.content import SectionContact  # NOQA
+from .sections.events.content import ISectionEvents  # NOQA
+from .sections.events.content import SectionEvents  # NOQA
+from .sections.external_content.content import ISectionExternalContent  # NOQA
+from .sections.external_content.content import SectionExternalContent  # NOQA
+from .sections.files.content import ISectionFiles  # NOQA
+from .sections.files.content import SectionFiles  # NOQA
+from .sections.gallery.content import ISectionGallery  # NOQA
+from .sections.gallery.content import SectionGallery  # NOQA
+from .sections.html.content import ISectionHTML  # NOQA
+from .sections.html.content import SectionHTML  # NOQA
+from .sections.links.content import ISectionLinks  # NOQA
+from .sections.links.content import SectionLinks  # NOQA
+from .sections.map.content import ISectionMap  # NOQA
+from .sections.map.content import SectionMap  # NOQA
+from .sections.news.content import ISectionNews  # NOQA
+from .sections.news.content import SectionNews  # NOQA
+from .sections.postit.content import ISectionPostit  # NOQA
+from .sections.postit.content import SectionPostit  # NOQA
+from .sections.selections.content import ISectionSelections  # NOQA
+from .sections.selections.content import SectionSelections  # NOQA
+from .sections.sendinblue.content import ISectionSendinblue  # NOQA
+from .sections.sendinblue.content import SectionSendinblue  # NOQA
+from .sections.slide.content import ISectionSlide  # NOQA
+from .sections.slide.content import SectionSlide  # NOQA
+from .sections.text.content import ISectionText  # NOQA
+from .sections.text.content import SectionText  # NOQA
+from .sections.video.content import ISectionVideo  # NOQA
+from .sections.video.content import SectionVideo  # NOQA

{imio.smartweb.core-1.1.23 → imio.smartweb.core-1.1.25}/src/imio/smartweb/core/contents/configure.zcml

@@ -8,6 +8,7 @@
   <include package=".sections" />
 
   <unconfigure>
+    <adapter factory="plone.app.imagecropping.dx.CroppingUtilsDexterity" />
     <adapter
         for="plone.dexterity.interfaces.IDexterityContent"
         provides="imio.smartweb.common.interfaces.ICropping"
@@ -15,6 +16,8 @@
         />
   </unconfigure>
 
+  <adapter factory=".cropping.SmartwebCroppingUtilsDexterity" />
+
   <adapter
       for="plone.dexterity.interfaces.IDexterityContent"
       provides="imio.smartweb.common.interfaces.ICropping"

imio.smartweb.core-1.1.25/src/imio/smartweb/core/contents/cropping.py

@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+
+from imio.smartweb.common.adapters import BaseCroppingProvider
+from plone.app.imagecropping.dx import CroppingUtilsDexterity
+from plone.app.imagecropping.interfaces import IImageCroppingUtils
+from plone.namedfile.interfaces import IImage
+from plone.namedfile.interfaces import IImageScaleTraversable
+from zope.component import adapter
+from zope.interface import implementer
+
+
+UNCROPPABLE_FIELDS = ["banner"]
+
+
+class SmartwebCroppingProvider(BaseCroppingProvider):
+    def get_scales(self, fieldname, request=None):
+        """Define default cropping scales for all common fields"""
+        if fieldname in ["banner", "background_image"]:
+            # scale used for banner fields or background_image fields
+            return []
+        elif fieldname == "image":
+            # scales used for lead_image fields
+            return ["liste", "vignette", "slide"]
+        else:
+            return super(SmartwebCroppingProvider, self).get_scales(fieldname, request)
+
+
+@implementer(IImageCroppingUtils)
+@adapter(IImageScaleTraversable)
+class SmartwebCroppingUtilsDexterity(CroppingUtilsDexterity):
+    def _image_field_values(self):
+        """Remove banner field from cropping editor"""
+        for fieldname, field in self._all_fields():
+            value = getattr(self.context, fieldname, None)
+            if (
+                value
+                and IImage.providedBy(value)
+                and fieldname not in UNCROPPABLE_FIELDS
+            ):
+                yield (fieldname, value)

{imio.smartweb.core-1.1.23 → imio.smartweb.core-1.1.25}/src/imio/smartweb/core/contents/sections/external_content/configure.zcml

@@ -11,4 +11,12 @@
       layer="imio.smartweb.core.interfaces.IImioSmartwebCoreLayer"
       />
 
+  <browser:page
+      name="view_arcgis"
+      for="*"
+      class="imio.smartweb.core.contents.sections.external_content.views.ArcgisView"
+      template="view_arcgis.pt"
+      permission="zope2.View"
+      layer="imio.smartweb.core.interfaces.IImioSmartwebCoreLayer"
+      />
 </configure>

{imio.smartweb.core-1.1.23 → imio.smartweb.core-1.1.25}/src/imio/smartweb/core/contents/sections/external_content/view.pt

@@ -10,10 +10,15 @@
 <metal:main fill-slot="content-core">
 <metal:content-core define-macro="content-core">
 <metal:macro use-macro="context/@@sections_macros/section_edition" />
-<div class="container section-container section-video"
+<div class="container section-container section-external-content"
      id=""
      tal:attributes="id string:container-section-${context/id}">
 
+
+    <tal:check tal:condition="view/has_leadimage">
+        <img tal:attributes="src view/image" />
+    </tal:check>
+
   <metal:macro use-macro="context/@@sections_macros/section_title" />
 
   <p tal:replace="structure context/@@description" />

imio.smartweb.core-1.1.25/src/imio/smartweb/core/contents/sections/external_content/view_arcgis.pt

@@ -0,0 +1,149 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      lang="en"
+      metal:use-macro="context/@@main_template/macros/master"
+      i18n:domain="plone">
+
+<body>
+<metal:main fill-slot="content-core">
+	<!-- Master Header -->
+	<nav class="navbar navbar-expand-lg sticky-top bg-body-tertiary rounded">
+        <!--div class="container-fluid">
+          <img  src="../assets/img/navapp.png" width="100%" height="100%" />
+        </div-->
+  </nav>
+
+  <div id="viewDiv"></div>
+
+  <div id="titleDiv" class="esri-widget">
+      <div id="titleText"><b>Les voiries vicinales</b></div>
+      <div>Date de la donnée : 2014</div>
+  </div>
+
+  <div id="backbar">
+      <div id="linkBack"><a href=".."><i class="fa-solid fa-arrow-left fa-fade"></i>Retour</a></div>
+  </div>
+
+  <div id="arcgis_item" tal:attributes="data-id view/get_portal_item_id;"></div>
+
+  <script src="https://js.arcgis.com/4.27/"></script>
+  <script language="JavaScript">
+    require(["esri/views/MapView", "esri/widgets/Legend", "esri/widgets/Expand", "esri/widgets/Home", "esri/widgets/Search","esri/widgets/BasemapGallery", "esri/widgets/Print", "esri/widgets/LayerList", "esri/WebMap"],
+      (
+        MapView,
+        Legend,
+        Expand,
+        Home,
+        Search,
+        BasemapGallery,
+        Print,
+        LayerList,
+        WebMap
+      ) => {
+        const webmap = new WebMap({
+          portalItem: {
+            // autocasts as new PortalItem()
+            id: document.querySelector("#arcgis_item").dataset.id
+          }
+        });
+
+        const view = new MapView({
+          container: "viewDiv",
+          map: webmap
+        });
+
+        /* Legend */
+
+        const legend = new Expand({
+          content: new Legend({
+            view: view,
+            style: "classic" // other styles include 'classic'
+          }),
+          view: view,
+          expanded: true
+        });
+
+        view.ui.add(legend, "bottom-left");
+
+            /* Home */
+            const homeBtn = new Home({
+                view: view,
+                expanded: true
+            });
+
+            view.ui.add(homeBtn, "top-left");
+
+
+                /* Search */
+        const searchWidget = new Search({
+            view: view
+        });
+
+        SearchExpand = new Expand({
+            expandIcon: "search",  // see https://developers.arcgis.com/calcite-design-system/icons/
+            // expandTooltip: "Expand LayerList", // optional, defaults to "Expand" for English locale
+            view: view,
+            content: searchWidget
+        });
+
+            /* Basemap Gallery */
+            const basemapGallery = new BasemapGallery({
+                view: view
+            });
+
+            BasemapGalleryExpand = new Expand({
+                expandIcon: "basemap",  // see https://developers.arcgis.com/calcite-design-system/icons/
+                // expandTooltip: "Expand LayerList", // optional, defaults to "Expand" for English locale
+                view: view,
+                content: basemapGallery
+            });
+
+            /* Print */
+            const print = new Print({
+                view: view,
+                // specify your own print service
+                printServiceUrl:
+                    "https://utility.arcgisonline.com/arcgis/rest/services/Utilities/PrintingTools/GPServer/Export%20Web%20Map%20Task"
+            });
+
+            PrintExpand = new Expand({
+                expandIcon: "print",  // see https://developers.arcgis.com/calcite-design-system/icons/
+                // expandTooltip: "Expand LayerList", // optional, defaults to "Expand" for English locale
+                view: view,
+                content: print
+            });
+
+                /* Layers List */
+        const layerList = new LayerList({
+            view: view,
+            listItemCreatedFunction: (event) => {
+                const item = event.item;
+                if (item.layer.type != "group") {
+                    // don't show legend twice
+                    item.panel = {
+                        content: "legend",
+                        open: true
+                    };
+                }
+            }
+        });
+
+        layerListExpand = new Expand({
+            expandIcon: "layers",  // see https://developers.arcgis.com/calcite-design-system/icons/
+            // expandTooltip: "Expand LayerList", // optional, defaults to "Expand" for English locale
+            view: view,
+            content: layerList,
+            expanded: false
+        });
+
+        view.ui.add([SearchExpand, BasemapGalleryExpand, PrintExpand, layerListExpand], "top-right");
+
+            view.ui.add("titleDiv", "bottom-right");
+      });
+  </script>
+</metal:main>
+</body>
+
+</html>

{imio.smartweb.core-1.1.23 → imio.smartweb.core-1.1.25}/src/imio/smartweb/core/contents/sections/external_content/views.py

@@ -3,31 +3,63 @@
 from embeddify import Embedder
 from embeddify import Plugin
 from imio.smartweb.core.contents.sections.views import SectionView
+from imio.smartweb.core.interfaces import IArcgisViewUtils
 from imio.smartweb.locales import SmartwebMessageFactory as _
 from json.decoder import JSONDecodeError
+from plone import api
+from plone.app.contenttypes.behaviors.leadimage import ILeadImage
+from Products.Five.browser import BrowserView
+from zope.i18n import translate
+from zope.interface import implementer
 
 import json
 
 
 class ExternalContentView(SectionView):
     def get_embed_external_content(self, width="100%", height=600):
+        current_lang = api.portal.get_current_language()[:2]
         plugins = [
             EaglebePlugin(),
             EllohaPlugin(),
             CognitoformPlugin(),
+            ArcgisPlugin(),
             UnknowServicePlugin(),
         ]
         extra_params = self.context.external_content_params
         plugin_config = {
             "eaglebeplugin": {"width": width},
-            "ellohaplugin": {"width": width, "extra_params": extra_params},
-            "cognitoformplugin": {"width": width, "extra_params": extra_params},
-            "unknowserviceplugin": {"width": width},
+            "ellohaplugin": {
+                "width": width,
+                "current_lang": current_lang,
+                "extra_params": extra_params,
+            },
+            "cognitoformplugin": {
+                "width": width,
+                "current_lang": current_lang,
+                "extra_params": extra_params,
+            },
+            "arcgisplugin": {
+                "width": width,
+                "url": self.context.absolute_url(),
+                "current_lang": current_lang,
+                "extra_params": extra_params,
+            },
+            "unknowserviceplugin": {"width": width, "current_lang": current_lang},
         }
         embedder = Embedder(plugins=plugins, plugin_config=plugin_config)
         url = self.context.external_content_url
         return embedder(url, config={"width": width})
 
+    def has_leadimage(self):
+        if ILeadImage.providedBy(self.context) and getattr(
+            self.context, "image", False
+        ):
+            return True
+        return False
+
+    def image(self):
+        return f"{self.context.absolute_url()}/@@download/image"
+
 
 class EaglebePlugin(Plugin):
     def __call__(self, parts, config={}):
@@ -45,8 +77,12 @@ class EllohaPlugin(Plugin):
             #     "ConstellationWidgetContainer": "917c4c52-c997-4077-9135-873a0b2e0c85",
             #     "Idoi": "195ea849-1732-4a69-a051-e7911001cd09"
             # }
+            current_lang = config["current_lang"]
             extra_params = config["extra_params"]
-            error_message = '<div class="elloha">With an elloha plugin, extra params must contain a dictionary with two keys : ConstellationWidgetContainer, Idoi</div>'
+
+            error_message = "With an elloha plugin, extra params must contain a dictionary with two keys : ConstellationWidgetContainer, Idoi"
+            error_message = translate(_(error_message), target_language=current_lang)
+            error_message = f'<div class="elloha elloha_error">{error_message}</div>'
 
             if (
                 extra_params is None
@@ -85,9 +121,16 @@ class EllohaPlugin(Plugin):
 
 class CognitoformPlugin(Plugin):
     def __call__(self, parts, config={}):
-        extra_params = config["extra_params"]
-        error_message = '<div class="cognitoform">With a cognitoform plugin, extra params can be void but if you complete it you must specify : scrolling:(yes/no) and overflow:(hidden/scroll/auto)</div>'
         if "cognitoforms" in parts.netloc:
+            current_lang = config["current_lang"]
+            extra_params = config["extra_params"]
+
+            error_message = "With a cognitoform plugin, extra params can be void but if you complete it you must specify : scrolling:(yes/no) and overflow:(hidden/scroll/auto)"
+            error_message = translate(_(error_message), target_language=current_lang)
+            error_message = (
+                f'<div class="cognitoform cognitoform_error">{error_message}</div>'
+            )
+
             if extra_params is None:
                 return f'<iframe src="{parts.geturl()}" style="border: 0px none; width: {config["width"]}%; overflow: auto;" scrolling="yes"></iframe>'
             else:
@@ -108,6 +151,54 @@ class CognitoformPlugin(Plugin):
         return None
 
 
+class ArcgisPlugin(Plugin):
+    def __call__(self, parts, config={}):
+        if "arcgis" in parts.netloc:
+            # url : https://developers.arcgis.com/
+            # extra_params : {"portal_item_id":"27a432b0835149e6acd3ac39d0e4349c"}
+            current_lang = config["current_lang"]
+            extra_params = config["extra_params"]
+            url = config["url"]
+
+            error_message = "With arcgis plugin, extra params must contain a dictionary with one key : portal_item_id"
+            error_message = translate(_(error_message), target_language=current_lang)
+            error_message = f'<div class="arcgis arcgis_error">{error_message}</div>'
+
+            if (
+                extra_params is None
+                or extra_params[0] != "{"
+                or extra_params[-1] != "}"
+            ):
+                return error_message
+            try:
+                res = json.loads(extra_params.lower())
+            except JSONDecodeError:
+                return error_message
+            if res.get("portal_item_id") is None:
+                return error_message
+
+            portal_item_id = res.get("portal_item_id")
+            msg = "Consult the map"
+            msg = translate(_(msg), target_language=current_lang)
+            return (
+                f'<a href="{url}/view_arcgis?portal_item_id={portal_item_id}">{msg}</a>'
+            )
+        #
+        return None
+
+
 class UnknowServicePlugin(Plugin):
     def __call__(self, parts, config={}):
-        return _("<p class='unknow_service'>Unknow service</p>")
+        current_lang = config["current_lang"]
+        msg = "Unknow service"
+        msg = translate(_(msg), target_language=current_lang)
+        return f'<p class="unknow_service">{msg}</p>'
+
+
+@implementer(IArcgisViewUtils)
+class ArcgisView(BrowserView):
+    _footer = None
+
+    @property
+    def get_portal_item_id(self):
+        return self.request.portal_item_id

{imio.smartweb.core-1.1.23 → imio.smartweb.core-1.1.25}/src/imio/smartweb/core/interfaces.py

@@ -24,3 +24,10 @@ class IImioSmartwebCoreLayer(
     ICollectiveMessagesviewletLayer,
 ):
     """Marker interface that defines a browser layer."""
+
+
+class IArcgisViewUtils(Interface):
+    """ """
+
+    def get_portal_item_id():
+        """Return id of a map"""

{imio.smartweb.core-1.1.23 → imio.smartweb.core-1.1.25}/src/imio/smartweb/core/profiles/default/metadata.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <metadata>
-  <version>1044</version>
+  <version>1045</version>
   <dependencies>
     <dependency>profile-plone.app.dexterity:default</dependency>
     <dependency>profile-plone.app.imagecropping:default</dependency>

{imio.smartweb.core-1.1.23 → imio.smartweb.core-1.1.25}/src/imio/smartweb/core/profiles/default/types/imio.smartweb.SectionExternalContent.xml

@@ -27,6 +27,7 @@
   <!-- Enabled behaviors -->
   <property name="behaviors" purge="false">
     <element value="plone.namefromtitle"/>
+    <element value="plone.leadimage"/>
     <element value="plone.locking"/>
     <element value="plone.shortname"/>
     <element value="imio.smartweb.topics"/>

{imio.smartweb.core-1.1.23 → imio.smartweb.core-1.1.25}/src/imio/smartweb/core/tests/test_banner.py

@@ -34,7 +34,7 @@ class TestBanner(ImioSmartwebTestCase):
         self.folder.banner = NamedBlobImage(**make_named_image())
         self.assertTrue(viewlet.available())
         self.assertIn(
-            "background-image:url(http://nohost/plone/folder/@@images/banner-1920",
+            "background-image:url(http://nohost/plone/folder/@@images/banner?cache_key=",
             viewlet.background_style(),
         )
         template = self.folder.restrictedTraverse("view")
@@ -124,7 +124,7 @@ class TestBanner(ImioSmartwebTestCase):
         # css_bg_image = f"background-image:url({scale.url});"
         # css_bg_size = "background-size:cover;"
         self.assertIn(
-            "background-image:url(http://nohost/plone/folder/@@images/banner-1920",
+            "background-image:url(http://nohost/plone/folder/@@images/banner?cache_key=",
             subfolder_viewlet.background_style(),
         )
         page_viewlet = BannerViewlet(page, self.request, None, None)
@@ -132,7 +132,7 @@ class TestBanner(ImioSmartwebTestCase):
         self.assertTrue(page_viewlet.available())
         self.assertFalse(page_viewlet.is_banner_locally_hidden)
         self.assertIn(
-            "background-image:url(http://nohost/plone/folder/@@images/banner-1920",
+            "background-image:url(http://nohost/plone/folder/@@images/banner?cache_key=",
             page_viewlet.background_style(),
         )
 

{imio.smartweb.core-1.1.23 → imio.smartweb.core-1.1.25}/src/imio/smartweb/core/tests/test_cropping.py

@@ -3,9 +3,10 @@
 from imio.smartweb.common.interfaces import ICropping
 from imio.smartweb.core.testing import IMIO_SMARTWEB_CORE_FUNCTIONAL_TESTING
 from imio.smartweb.core.testing import ImioSmartwebTestCase
-from imio.smartweb.core.tests.utils import make_named_image
 from imio.smartweb.core.tests.utils import get_sections_types
+from imio.smartweb.core.tests.utils import make_named_image
 from plone import api
+from plone.app.imagecropping.interfaces import IImageCroppingUtils
 from plone.app.testing import TEST_USER_ID
 from plone.app.testing import setRoles
 from plone.namedfile.file import NamedBlobImage
@@ -90,13 +91,21 @@ class TestCropping(ImioSmartwebTestCase):
             self.assertEqual([], adapter.get_scales("background_image", self.request))
             self.assertNotIn("banner", adapter.get_scales("image", self.request))
 
+    def test_uncroppable_fields(self):
+        self.folder.banner = NamedBlobImage(**make_named_image("plone.png"))
+        self.folder.image = NamedBlobImage(**make_named_image("plone.png"))
+        adapter = IImageCroppingUtils(self.folder, alternate=None)
+        self.assertIsNotNone(adapter)
+        self.assertEqual(len(list(adapter._image_field_values())), 1)
+        self.assertEqual(adapter.image_field_names(), ["image"])
+
     def test_cropping_view(self):
+        self.folder.banner = NamedBlobImage(**make_named_image("plone.png"))
+        self.folder.image = NamedBlobImage(**make_named_image("plone.png"))
         cropping_view = getMultiAdapter(
             (self.folder, self.request), name="croppingeditor"
         )
         self.assertEqual(len(list(cropping_view._scales("banner"))), 0)
         self.assertEqual(len(list(cropping_view._scales("image"))), 3)
-        cropping_view = getMultiAdapter(
-            (self.page, self.request), name="croppingeditor"
-        )
-        self.assertEqual(len(list(cropping_view._scales("image"))), 3)
+        self.assertNotIn("Banner", cropping_view())
+        self.assertIn("Lead Image", cropping_view())