From 46fe0db5215b33b2d84f2c88a7ec30f0341e5388 Mon Sep 17 00:00:00 2001
From: Laurent Lasudry <lasudry@gmail.com>
Date: Fri, 24 May 2024 16:34:36 +0200
Subject: [PATCH] Fix bundles

Remove obsolete patterns bundle and fix a previous upgrade for `eea.facetednavigation`
---
 CHANGES.rst                                    |  4 ++++
 .../common/profiles/default/metadata.xml       |  2 +-
 .../smartweb/common/upgrades/configure.zcml    | 18 ++++++++++++++++++
 .../profiles/1029_to_1030/registry.xml         | 13 +++++++++++++
 4 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 src/imio/smartweb/common/upgrades/profiles/1029_to_1030/registry.xml

diff --git a/CHANGES.rst b/CHANGES.rst
index 6872263..11e71d4 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,6 +5,10 @@ Changelog
 1.2.14 (unreleased)
 -------------------
 
+- Fix bundles: Remove obsolete patterns bundle and fix a previous upgrade for
+  eea.facetednavigation
+  [laulaz]
+
 - Fix translate call (was causing incorrect string in .po file)
   [laulaz]
 
diff --git a/src/imio/smartweb/common/profiles/default/metadata.xml b/src/imio/smartweb/common/profiles/default/metadata.xml
index e33c133..5a4200b 100644
--- a/src/imio/smartweb/common/profiles/default/metadata.xml
+++ b/src/imio/smartweb/common/profiles/default/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metadata>
-  <version>1029</version>
+  <version>1030</version>
   <dependencies>
     <dependency>profile-plone.restapi:default</dependency>
     <dependency>profile-eea.facetednavigation:default</dependency>
diff --git a/src/imio/smartweb/common/upgrades/configure.zcml b/src/imio/smartweb/common/upgrades/configure.zcml
index e35eb43..6d0df98 100644
--- a/src/imio/smartweb/common/upgrades/configure.zcml
+++ b/src/imio/smartweb/common/upgrades/configure.zcml
@@ -132,6 +132,14 @@
       provides="Products.GenericSetup.interfaces.EXTENSION"
       />
 
+  <genericsetup:registerProfile
+      name="upgrade_1029_to_1030"
+      title="Upgrade common from 1029 to 1030"
+      directory="profiles/1029_to_1030"
+      description="Remove obsolete patterns bundle / fix previous 1027_to_1028 upgrade"
+      provides="Products.GenericSetup.interfaces.EXTENSION"
+      />
+
   <genericsetup:upgradeStep
       title="Configure first official release"
       description="Run needed registry step"
@@ -420,4 +428,14 @@
         />
   </genericsetup:upgradeSteps>
 
+  <genericsetup:upgradeSteps
+      source="1029"
+      destination="1030"
+      profile="imio.smartweb.common:default">
+    <genericsetup:upgradeDepends
+        title="Remove obsolete patterns bundle / fix previous 1027_to_1028 upgrade"
+        import_profile="imio.smartweb.common.upgrades:upgrade_1029_to_1030"
+        />
+  </genericsetup:upgradeSteps>
+
 </configure>
diff --git a/src/imio/smartweb/common/upgrades/profiles/1029_to_1030/registry.xml b/src/imio/smartweb/common/upgrades/profiles/1029_to_1030/registry.xml
new file mode 100644
index 0000000..c33ed08
--- /dev/null
+++ b/src/imio/smartweb/common/upgrades/profiles/1029_to_1030/registry.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<registry>
+
+  <records prefix="plone.bundles/patterns"
+           interface="Products.CMFPlone.interfaces.IBundleRegistry"
+           remove="true" />
+
+  <records prefix="plone.bundles/faceted.jquery"
+        interface="Products.CMFPlone.interfaces.IBundleRegistry">
+    <value key="jscompilation">++plone++facetednavigation/faceted-jquery.min.js</value>
+  </records>
+
+</registry>