imio.smartweb.core 1.2.33__py3-none-any.whl → 1.2.37__py3-none-any.whl

imio/smartweb/core/profiles/default/types/Image.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<object xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+        meta_type="Dexterity FTI"
+        name="Image"
+        i18n:domain="plone"
+>
+
+  <!-- Enabled behaviors -->
+  <property name="behaviors" purge="false">
+    <element value="solr.fields" />
+  </property>
+
+</object>

imio/smartweb/core/profiles/default/types/imio.smartweb.BlockLink.xml

@@ -38,4 +38,9 @@
   <property name="view_methods">
     <element value="link_redirect_view"/>
   </property>
+
+  <!-- Enabled behaviors -->
+  <property name="behaviors" purge="false">
+    <element value="solr.fields" />
+  </property>
 </object>

imio/smartweb/core/profiles/default/types/imio.smartweb.CirkwiView.xml

@@ -37,6 +37,7 @@
     <element value="imio.smartweb.iam"/>
     <element value="plone.categorization"/>
     <element value="collective.autopublishing.behavior.IAutoPublishing"/>
+    <element value="solr.fields" />
   </property>
 
 </object>

imio/smartweb/core/profiles/default/types/imio.smartweb.DirectoryView.xml

@@ -38,6 +38,7 @@
     <element value="imio.smartweb.iam"/>
     <element value="plone.categorization"/>
     <element value="collective.autopublishing.behavior.IAutoPublishing"/>
+    <element value="solr.fields" />
   </property>
 
 </object>

imio/smartweb/core/profiles/default/types/imio.smartweb.EventsView.xml

@@ -38,6 +38,7 @@
     <element value="imio.smartweb.iam"/>
     <element value="plone.categorization"/>
     <element value="collective.autopublishing.behavior.IAutoPublishing"/>
+    <element value="solr.fields" />
   </property>
 
 </object>

imio/smartweb/core/profiles/default/types/imio.smartweb.Folder.xml

@@ -51,6 +51,7 @@
     <element value="imio.smartweb.listing"/>
     <element value="imio.smartweb.quickaccessselection"/>
     <element value="collective.autopublishing.behavior.IAutoPublishing"/>
+    <element value="solr.fields" />
   </property>
 
   <!-- View information -->

imio/smartweb/core/profiles/default/types/imio.smartweb.NewsView.xml

@@ -38,6 +38,7 @@
     <element value="imio.smartweb.iam"/>
     <element value="plone.categorization"/>
     <element value="collective.autopublishing.behavior.IAutoPublishing"/>
+    <element value="solr.fields" />
   </property>
 
 </object>

imio/smartweb/core/profiles/default/types/imio.smartweb.Page.xml

@@ -51,6 +51,7 @@
     <element value="imio.smartweb.iam"/>
     <element value="plone.categorization"/>
     <element value="collective.autopublishing.behavior.IAutoPublishing"/>
+    <element value="solr.fields" />
   </property>
 
   <!-- View information -->

imio/smartweb/core/profiles/default/types/imio.smartweb.PortalPage.xml

@@ -54,6 +54,7 @@
     <element value="imio.smartweb.iam"/>
     <element value="plone.categorization"/>
     <element value="collective.autopublishing.behavior.IAutoPublishing"/>
+    <element value="solr.fields" />
   </property>
 
   <!-- View information -->

imio/smartweb/core/profiles/default/types/imio.smartweb.Procedure.xml

@@ -51,6 +51,7 @@
     <element value="imio.smartweb.iam"/>
     <element value="plone.categorization"/>
     <element value="collective.autopublishing.behavior.IAutoPublishing"/>
+    <element value="solr.fields" />
   </property>
 
   <!-- View information -->

imio/smartweb/core/profiles/default/types/imio.smartweb.SectionHTML.xml

@@ -32,7 +32,6 @@
     <element value="plone.namefromtitle"/>
     <element value="plone.locking"/>
     <element value="plone.shortname"/>
-    <element value="plone.versioning" />
   </property>
 
 </object>

imio/smartweb/core/profiles/validation/contentrules.xml

@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<contentrules>
+ <rule name="rule-1" title="Notification de contenu à valider"
+    cascading="False" description="" enabled="True"
+    event="Products.CMFCore.interfaces.IActionSucceededEvent"
+    stop-after="False">
+  <conditions>
+   <condition type="plone.conditions.PortalType">
+    <property name="check_types">
+     <element>imio.smartweb.Page</element>
+     <element>imio.smartweb.PortalPage</element>
+     <element>imio.smartweb.Procedure</element>
+    </property>
+   </condition>
+   <condition type="plone.conditions.WorkflowState">
+    <property name="wf_states">
+     <element>pending</element>
+    </property>
+   </condition>
+  </conditions>
+  <actions>
+   <action type="plone.actions.Mail">
+    <property name="subject">Nouveau contenu sur le site</property>
+    <property name="source"/>
+    <property name="recipients">${reviewer_emails}</property>
+    <property name="exclude_actor">False</property>
+    <property name="message">Un nouveau contenu a été soumis à validation. Cliquez sur le lien pour aller le valider ou le refuser : ${absolute_url}</property>
+   </action>
+   <action type="plone.actions.Logger">
+    <property name="targetLogger">imio.smartweb.core</property>
+    <property name="loggingLevel">20</property>
+    <property
+       name="message">Content to review notification sent for &amp;c.</property>
+   </action>
+  </actions>
+ </rule>
+ <rule name="rule-2" title="Notification de modification de section de contenu publié"
+    cascading="False" description="" enabled="True"
+    event="zope.lifecycleevent.interfaces.IObjectModifiedEvent"
+    stop-after="False">
+  <conditions>
+   <condition type="plone.conditions.PortalType">
+    <property name="check_types">
+     <element>imio.smartweb.SectionText</element>
+    </property>
+   </condition>
+   <condition type="plone.conditions.TalesExpression">
+    <property
+       name="tales_expression">python: hasattr(here, &quot;aq_parent&quot;) and portal.portal_workflow.getInfoFor(here.aq_parent, &quot;review_state&quot;, &quot;&quot;) == &quot;published&quot;</property>
+   </condition>
+  </conditions>
+  <actions>
+   <action type="plone.actions.Mail">
+    <property name="subject">Contenu publié modifié sur le site</property>
+    <property name="source"/>
+    <property name="recipients">${reviewer_emails}</property>
+    <property name="exclude_actor">False</property>
+    <property name="message">Une section texte d&#x27;un contenu déjà publié a été modifiée. Cliquez sur le lien pour consulter la modification effectuée : ${absolute_url}/@@historyview</property>
+   </action>
+   <action type="plone.actions.Logger">
+    <property name="targetLogger">imio.smartweb.core</property>
+    <property name="loggingLevel">20</property>
+    <property
+       name="message">Published content change notification sent for &amp;c (user: &amp;u).</property>
+   </action>
+  </actions>
+ </rule>
+ <rule name="rule-3" title="Notification d'ajout de section à un contenu publié"
+    cascading="False" description="" enabled="True"
+    event="zope.lifecycleevent.interfaces.IObjectAddedEvent"
+    stop-after="False">
+  <conditions>
+   <condition type="plone.conditions.PortalType">
+    <property name="check_types">
+     <element>imio.smartweb.SectionText</element>
+    </property>
+   </condition>
+   <condition type="plone.conditions.TalesExpression">
+    <property
+       name="tales_expression">python: hasattr(here, &quot;aq_parent&quot;) and portal.portal_workflow.getInfoFor(here.aq_parent, &quot;review_state&quot;, &quot;&quot;) == &quot;published&quot;</property>
+   </condition>
+  </conditions>
+  <actions>
+   <action type="plone.actions.Mail">
+    <property name="subject">Contenu publié modifié sur le site</property>
+    <property name="source"/>
+    <property name="recipients">${reviewer_emails}</property>
+    <property name="exclude_actor">False</property>
+    <property name="message">Une section texte a été ajoutée à un contenu déjà publié. Cliquez sur le lien pour consulter la section texte ajoutée : ${absolute_url}</property>
+   </action>
+   <action type="plone.actions.Logger">
+    <property name="targetLogger">imio.smartweb.core</property>
+    <property name="loggingLevel">20</property>
+    <property
+       name="message">Published content add notification sent for &amp;c (user: &amp;u).</property>
+   </action>
+  </actions>
+ </rule>
+ <assignment name="rule-1" bubbles="True" enabled="True" location=""/>
+ <assignment name="rule-2" bubbles="True" enabled="True" location=""/>
+ <assignment name="rule-3" bubbles="True" enabled="True" location=""/>
+</contentrules>

imio/smartweb/core/profiles.zcml

@@ -45,6 +45,14 @@
       provides="Products.GenericSetup.interfaces.EXTENSION"
       />
 
+  <genericsetup:registerProfile
+      name="validation"
+      title="imio.smartweb.core validation"
+      directory="profiles/validation"
+      description="Installs smartweb validation content rules"
+      provides="Products.GenericSetup.interfaces.EXTENSION"
+      />
+
   <genericsetup:registerProfile
       name="last-compilation"
       title="imio.smartweb.core last compilation dates"

imio/smartweb/core/tests/test_section_external_content.py

@@ -28,28 +28,28 @@ class TestSectionExternalContent(ImioSmartwebTestCase):
         sec.external_content_url = "https://kamoulox.be"
         section_view = queryMultiAdapter((sec, self.request), name="view")
         self.assertEqual(
-            section_view.get_embed_external_content(),
+            section_view.contents,
             '<p class="unknow_service">Unknow service</p>',
         )
 
-    # def test_eaglebe_plugin(self):
-    #     sec = api.content.create(
-    #         container=self.page, type="imio.smartweb.SectionExternalContent", id="sec"
-    #     )
+    def test_eaglebe_plugin(self):
+        sec = api.content.create(
+            container=self.page, type="imio.smartweb.SectionExternalContent", id="sec"
+        )
 
-    #     sec.external_content_url = ""
-    #     section_view = queryMultiAdapter((sec, self.request), name="view")
-    #     self.assertEqual(
-    #         section_view.get_embed_external_content(),
-    #         '<p class="unknow_service">Unknow service</p>',
-    #     )
+        sec.external_content_url = ""
+        section_view = queryMultiAdapter((sec, self.request), name="view")
+        self.assertEqual(
+            section_view.contents,
+            '<p class="unknow_service">Unknow service</p>',
+        )
 
-    #     sec.external_content_url = "https://app.eaglebe.com/auth/start"
-    #     section_view = queryMultiAdapter((sec, self.request), name="view")
-    #     self.assertEqual(
-    #         section_view.get_embed_external_content(),
-    #         '<iframe class="eaglebe" src="https://app.eaglebe.com/auth/start" scrolling="no" width="100%">',
-    #     )
+        sec.external_content_url = "https://app.eaglebe.com/auth/start"
+        section_view = queryMultiAdapter((sec, self.request), name="view")
+        self.assertEqual(
+            section_view.contents,
+            '<iframe class="eaglebe" src="https://app.eaglebe.com/auth/start" scrolling="no" width="100%">',
+        )
 
     def test_elloha_plugin(self):
         sec = api.content.create(
@@ -62,7 +62,7 @@ class TestSectionExternalContent(ImioSmartwebTestCase):
         )
         section_view = queryMultiAdapter((sec, self.request), name="view")
         self.assertEqual(
-            section_view.get_embed_external_content(),
+            section_view.contents,
             '<div class="elloha elloha_error">With an elloha plugin, extra params must contain a dictionary with two keys : ConstellationWidgetContainer, Idoi</div>',
         )
 
@@ -73,7 +73,7 @@ class TestSectionExternalContent(ImioSmartwebTestCase):
         }"""
         section_view = queryMultiAdapter((sec, self.request), name="view")
         result = '<div class="elloha"><div id="ConstellationWidgetContainer11111111-1111-1111-1111-111111111111" style="width:100%" data-id-projet="11111111111111111111111111111111">...</div></div><script type="text/javascript" src="https://reservation.elloha.com/Scripts/widget-loader.min.js?v=42/Scripts/widget-loader.min.js?v=42"></script><script type="text/javascript">var constellationWidgetUrl11111111111111111111111111111111, constellationTypeModule11111111111111111111111111111111;constellationWidgetUrl11111111111111111111111111111111 = "https://reservation.elloha.com/Widget/BookingEngine/11111111-1111-1111-1111-111111111111?idoi=22222222-2222-2222-2222-222222222222&culture=fr-FR";constellationTypeModule11111111111111111111111111111111=1; constellationWidgetLoad("ConstellationWidgetContainer11111111-1111-1111-1111-111111111111");constellationWidgetAddEvent(window, "resize", function () {constellationWidgetSetAppearance("ConstellationWidgetContainer11111111-1111-1111-1111-111111111111");});</script>'
-        self.assertEqual(section_view.get_embed_external_content(), result)
+        self.assertEqual(section_view.contents, result)
 
         # good extra params / dict keys are case insensitive
         sec.external_content_params = """{
@@ -82,20 +82,20 @@ class TestSectionExternalContent(ImioSmartwebTestCase):
         }"""
         section_view = queryMultiAdapter((sec, self.request), name="view")
         result = '<div class="elloha"><div id="ConstellationWidgetContainer11111111-1111-1111-1111-111111111111" style="width:100%" data-id-projet="11111111111111111111111111111111">...</div></div><script type="text/javascript" src="https://reservation.elloha.com/Scripts/widget-loader.min.js?v=42/Scripts/widget-loader.min.js?v=42"></script><script type="text/javascript">var constellationWidgetUrl11111111111111111111111111111111, constellationTypeModule11111111111111111111111111111111;constellationWidgetUrl11111111111111111111111111111111 = "https://reservation.elloha.com/Widget/BookingEngine/11111111-1111-1111-1111-111111111111?idoi=22222222-2222-2222-2222-222222222222&culture=fr-FR";constellationTypeModule11111111111111111111111111111111=1; constellationWidgetLoad("ConstellationWidgetContainer11111111-1111-1111-1111-111111111111");constellationWidgetAddEvent(window, "resize", function () {constellationWidgetSetAppearance("ConstellationWidgetContainer11111111-1111-1111-1111-111111111111");});</script>'
-        self.assertEqual(section_view.get_embed_external_content(), result)
+        self.assertEqual(section_view.contents, result)
 
         # with bad params
         sec.external_content_params = "kamoulox"
         section_view = queryMultiAdapter((sec, self.request), name="view")
         result = '<div class="elloha elloha_error">With an elloha plugin, extra params must contain a dictionary with two keys : ConstellationWidgetContainer, Idoi</div>'
-        self.assertEqual(section_view.get_embed_external_content(), result)
+        self.assertEqual(section_view.contents, result)
 
         sec.external_content_params = """{
             "ConstellationWidgetContainer" : "11111111-1111-1111-1111-111111111111"
         }"""
         section_view = queryMultiAdapter((sec, self.request), name="view")
         result = '<div class="elloha elloha_error">With an elloha plugin, extra params must contain a dictionary with two keys : ConstellationWidgetContainer, Idoi</div>'
-        self.assertEqual(section_view.get_embed_external_content(), result)
+        self.assertEqual(section_view.contents, result)
 
         sec.external_content_params = """{
             "CONSTELLATIONWIDGETCONTAINER" : "11111111-1111-1111-1111-111111111111",
@@ -103,4 +103,4 @@ class TestSectionExternalContent(ImioSmartwebTestCase):
         """
         section_view = queryMultiAdapter((sec, self.request), name="view")
         result = '<div class="elloha elloha_error">With an elloha plugin, extra params must contain a dictionary with two keys : ConstellationWidgetContainer, Idoi</div>'
-        self.assertEqual(section_view.get_embed_external_content(), result)
+        self.assertEqual(section_view.contents, result)

imio/smartweb/core/tests/test_sections.py

@@ -125,24 +125,12 @@ class TestSections(ImioSmartwebTestCase):
             type="imio.smartweb.SectionExternalContent",
             title="Section External Content",
         )
-        # section.external_content_url = (
-        #     "https://app.eaglebe.com/fr-be/map/la%20louvi%C3%A8re"
-        # )
-        # view = queryMultiAdapter((section, self.request), name="view")
-        # embedded_content = view.get_embed_external_content()
-        # self.assertIn("iframe", embedded_content)
-        # self.assertIn('class="eaglebe"', embedded_content)
-        # self.assertIn('scrolling="no"', embedded_content)
-        # self.assertIn(
-        #     "https://app.eaglebe.com/fr-be/map/la%20louvi%C3%A8re", embedded_content
-        # )
 
         section.external_content_url = "http://www.perdu.com"
         view = queryMultiAdapter((section, self.request), name="view")
-        embedded_content = view.get_embed_external_content()
-        self.assertNotIn("iframe", embedded_content)
-        self.assertNotIn("class='eaglebe'", embedded_content)
-        self.assertIn('<p class="unknow_service">Unknow service</p>', embedded_content)
+        self.assertNotIn("iframe", view.contents)
+        self.assertNotIn("class='eaglebe'", view.contents)
+        self.assertIn('<p class="unknow_service">Unknow service</p>', view.contents)
 
     def test_map_section(self):
         section = api.content.create(
@@ -588,3 +576,21 @@ class TestSections(ImioSmartwebTestCase):
         self.assertEqual(
             view.get_class(section), "sectiontext my-css col-sm-3 with-background"
         )
+
+    def test_sections_history(self):
+        api.content.transition(self.page, "publish")
+        section_types = get_sections_types()
+        page_view = queryMultiAdapter((self.page, self.request), name="full_view")()
+        count_historyview_link = page_view.count("@@historyview")
+        self.assertEqual(count_historyview_link, 1)
+        for section_type in section_types:
+            api.content.create(
+                container=self.page,
+                type=section_type,
+                title="Title of my {}".format(section_type),
+            )
+        page_view = queryMultiAdapter((self.page, self.request), name="full_view")()
+        section_text = api.content.find(portal_type="imio.smartweb.SectionText")[0]
+        self.assertIn(f"{section_text.getURL()}/@@historyview", page_view)
+        # One more history view link on SectionText
+        self.assertEqual(page_view.count("@@historyview"), count_historyview_link + 1)

imio/smartweb/core/tests/test_sitemap.py

@@ -13,6 +13,7 @@ from plone.app.testing import TEST_USER_ID
 from plone.app.textfield.value import RichTextValue
 from plone.base.utils import safe_text
 from plone.namedfile.file import NamedBlobImage
+from unittest.mock import patch
 from zope.component import getMultiAdapter
 
 import json
@@ -87,7 +88,7 @@ class TestPage(ImioSmartwebTestCase):
             (self.portal, self.portal.REQUEST), name="sitemap.xml.gz"
         )
         xml = self.uncompress(sitemap())
-        self.assertIn("<lastmod >2024-02-02T08:00:00+00:00</lastmod>", xml)
+        self.assertIn("<lastmod >2024-02-02T08:00:00", xml)
         self.assertIn("<loc>http://nohost/plone/folder</loc>", xml)
         self.assertIn("http://nohost/plone/folder/page1", xml)
         self.assertNotIn(
@@ -115,7 +116,7 @@ class TestPage(ImioSmartwebTestCase):
         )
         # Gallery and image created 2024-02-02 10:00:00
         self.assertIn(
-            "<loc>http://nohost/plone/folder/page1/gallery/image/view</loc>\n    <lastmod >2024-02-02T10:00:00+00:00</lastmod>",
+            "<loc>http://nohost/plone/folder/page1/gallery/image/view</loc>\n    <lastmod >2024-02-02T10:00:00",
             xml,
         )
 
@@ -124,28 +125,46 @@ class TestPage(ImioSmartwebTestCase):
             "events": self.rest_agenda,
             "news": self.rest_news,
         }
+        contact_search_url = news_search_url = events_search_url = (
+            "http://localhost:8080/Plone/@querystring-search"
+        )
         for k, v in rest_views.items():
             api.portal.set_registry_record(f"smartweb.default_{k}_view", v.UID())
-
-        self.json_contacts = get_json("resources/json_contacts_raw_mock.json")
-        self.json_news = get_json("resources/json_rest_news.json")
-        self.json_events = get_json("resources/json_rest_events.json")
-
-        contact_search_url = f"http://localhost:8080/Plone/@search?selected_entities=396907b3b1b04a97896b12cc792c77f8&portal_type=imio.directory.Contact&fullobjects=0&sort_on=sortable_title"
-        news_search_url = f"http://localhost:8080/Plone/@search?selected_news_folders={self.rest_news.selected_news_folder}&portal_type=imio.news.NewsItem&fullobjects=0&sort_on=sortable_title"
-        events_search_url = f"http://localhost:8080/Plone/@events?selected_agendas={self.rest_agenda.selected_agenda}&portal_type=imio.events.Event&fullobjects=0&sort_on=sortable_title"
-
-        m.get(contact_search_url, text=json.dumps(self.json_contacts))
-        m.get(news_search_url, text=json.dumps(self.json_news))
-        m.get(events_search_url, text=json.dumps(self.json_events))
-
-        sitemap = getMultiAdapter(
-            (self.portal, self.portal.REQUEST), name="sitemap.xml.gz"
-        )
-        xml = self.uncompress(sitemap())
-        self.assertIn("<loc>http://nohost/plone/directory-view/contact1-title", xml)
-        self.assertIn("<loc>http://nohost/plone/news-view/", xml)
-        self.assertIn("<loc>http://nohost/plone/agenda-view/", xml)
+        with patch(
+            "imio.smartweb.core.contents.rest.utils.get_wca_token",
+            return_value="kamoulox",
+        ):
+            self.json_contacts = get_json("resources/json_contacts_raw_mock.json")
+            m.post(contact_search_url, text=json.dumps(self.json_contacts))
+            sitemap = getMultiAdapter(
+                (self.portal, self.portal.REQUEST), name="sitemap.xml.gz"
+            )
+            xml = self.uncompress(sitemap())
+            self.assertIn("<loc>http://nohost/plone/directory-view/contact1-title", xml)
+
+        with patch(
+            "imio.smartweb.core.contents.rest.utils.get_wca_token",
+            return_value="kamoulox",
+        ):
+            self.json_news = get_json("resources/json_rest_news.json")
+            m.post(news_search_url, text=json.dumps(self.json_news))
+            sitemap = getMultiAdapter(
+                (self.portal, self.portal.REQUEST), name="sitemap.xml.gz"
+            )
+            xml = self.uncompress(sitemap())
+            self.assertIn("<loc>http://nohost/plone/news-view/", xml)
+
+        with patch(
+            "imio.smartweb.core.contents.rest.utils.get_wca_token",
+            return_value="kamoulox",
+        ):
+            self.json_events = get_json("resources/json_rest_events.json")
+            m.post(events_search_url, text=json.dumps(self.json_events))
+            sitemap = getMultiAdapter(
+                (self.portal, self.portal.REQUEST), name="sitemap.xml.gz"
+            )
+            xml = self.uncompress(sitemap())
+            self.assertIn("<loc>http://nohost/plone/agenda-view/", xml)
 
     def uncompress(self, sitemapdata):
         sio = BytesIO(sitemapdata)

imio/smartweb/core/upgrades/configure.zcml

@@ -195,6 +195,30 @@
       provides="Products.GenericSetup.interfaces.EXTENSION"
       />
 
+  <genericsetup:registerProfile
+      name="upgrade_1052_to_1053"
+      title="Upgrade core from 1052 to 1053"
+      directory="profiles/1052_to_1053"
+      description="Fix versioning on imio.smartweb.SectionText"
+      provides="Products.GenericSetup.interfaces.EXTENSION"
+      />
+
+  <genericsetup:registerProfile
+      name="upgrade_1053_to_1054"
+      title="Upgrade core from 1053 to 1054"
+      directory="profiles/1053_to_1054"
+      description="Exclude some content_types from search results"
+      provides="Products.GenericSetup.interfaces.EXTENSION"
+      />
+
+    <genericsetup:registerProfile
+      name="upgrade_1054_to_1055"
+      title="Upgrade core from 1054 to 1055"
+      directory="profiles/1054_to_1055"
+      description="Add solr.fields behavior to some content types"
+      provides="Products.GenericSetup.interfaces.EXTENSION"
+      />
+
   <genericsetup:upgradeStep
       title="Configure first official release"
       description="Run needed profiles steps and reindex catalog"
@@ -729,4 +753,34 @@
     />
   </genericsetup:upgradeSteps>
 
+  <genericsetup:upgradeSteps
+      source="1052"
+      destination="1053"
+      profile="imio.smartweb.core:default">
+    <genericsetup:upgradeDepends
+        title="Fix versioning on imio.smartweb.SectionText"
+        import_profile="imio.smartweb.core.upgrades:upgrade_1052_to_1053"
+        />
+  </genericsetup:upgradeSteps>
+
+  <genericsetup:upgradeSteps
+      source="1053"
+      destination="1054"
+      profile="imio.smartweb.core:default">
+    <genericsetup:upgradeDepends
+        title="Exclude some content_types from search results"
+        import_profile="imio.smartweb.core.upgrades:upgrade_1053_to_1054"
+        />
+  </genericsetup:upgradeSteps>
+
+  <genericsetup:upgradeSteps
+      source="1054"
+      destination="1055"
+      profile="imio.smartweb.core:default">
+    <genericsetup:upgradeDepends
+        title="Add solr.fields behavior to some content types"
+        import_profile="imio.smartweb.core.upgrades:upgrade_1054_to_1055"
+        />
+  </genericsetup:upgradeSteps>
+
 </configure>

imio/smartweb/core/upgrades/profiles/1052_to_1053/diff_tool.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<object>
+ <difftypes>
+  <type portal_type="imio.smartweb.SectionText">
+   <field name="any" difftype="Compound Diff for Dexterity types"/>
+  </type>
+ </difftypes>
+</object>

imio/smartweb/core/upgrades/profiles/1052_to_1053/repositorytool.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<repositorytool>
+  <policymap purge="false">
+    <type name="imio.smartweb.SectionText">
+      <policy name="at_edit_autoversion" />
+      <policy name="version_on_revert" />
+    </type>
+  </policymap>
+</repositorytool>

imio/smartweb/core/upgrades/profiles/1052_to_1053/types/imio.smartweb.SectionHTML.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<object xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+    name="imio.smartweb.SectionHTML"
+    meta_type="Dexterity FTI"
+    i18n:domain="imio.smartweb">
+
+  <!-- Enabled behaviors -->
+  <property name="behaviors" purge="true">
+    <element value="plone.namefromtitle"/>
+    <element value="plone.locking"/>
+    <element value="plone.shortname"/>
+  </property>
+
+</object>

imio/smartweb/core/upgrades/profiles/1053_to_1054/registry.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<registry
+    xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+    i18n:domain="imio.smartweb">
+    <record name="plone.types_not_searched"
+            interface="Products.CMFPlone.interfaces.controlpanel.ISearchSchema"
+            field="types_not_searched">
+      <value purge="true">
+        <element>News Item</element>
+        <element>imio.smartweb.HeroBanner</element>
+        <element>Discussion Item</element>
+        <element>MessagesConfig</element>
+        <element>Folder</element>
+        <element>imio.smartweb.BlockLink</element>
+        <element>Message</element>
+        <element>Document</element>
+        <element>imio.smartweb.Footer</element>
+        <element>imio.smartweb.SectionHTML</element>
+        <element>imio.smartweb.SectionSendinblue</element>
+        <element>imio.smartweb.SectionNews</element>
+        <element>imio.smartweb.SectionCollection</element>
+        <element>imio.smartweb.SectionContact</element>
+        <element>imio.smartweb.SectionExternalContent</element>
+        <element>imio.smartweb.SectionSelections</element>
+        <element>imio.smartweb.SectionFiles</element>
+        <element>imio.smartweb.SectionLinks</element>
+        <element>imio.smartweb.SectionText</element>
+        <element>imio.smartweb.SectionGallery</element>
+        <element>imio.smartweb.SectionMap</element>
+        <element>imio.smartweb.SectionPostit</element>
+        <element>imio.smartweb.SectionSlide</element>
+        <element>imio.smartweb.SectionVideo</element>
+        <element>imio.smartweb.SectionEvents</element>
+        <element>Plone Site</element>
+        <element>TempFolder</element>
+        <element>Event</element>
+      </value>
+    </record>
+</registry>

imio/smartweb/core/upgrades/profiles/1054_to_1055/types/Collection.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<object xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+        meta_type="Dexterity FTI"
+        name="Collection"
+        i18n:domain="plone"
+>
+
+  <!-- Enabled behaviors -->
+  <property name="behaviors" purge="false">
+    <element value="solr.fields" />
+  </property>
+
+</object>

imio/smartweb/core/upgrades/profiles/1054_to_1055/types/File.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<object xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+        meta_type="Dexterity FTI"
+        name="File"
+        i18n:domain="plone"
+>
+
+  <!-- Enabled behaviors -->
+  <property name="behaviors" purge="false">
+    <element value="solr.fields" />
+  </property>
+
+</object>