From 7e5b8028f90033c6f98e67029e09d3cb4cba63af Mon Sep 17 00:00:00 2001
From: MrTango <md@derico.de>
Date: Fri, 22 Dec 2023 16:00:21 +0200
Subject: [PATCH 1/2] "Add upgrade_step: Update resource registry entries,
 remove resources, only bundles are needed now."

---
 .../profiles/default/metadata.xml             |  2 +-
 .../tests/test_upgrade_step_4007.py           | 29 +++++++++++++++++++
 .../EasyNewsletter/upgrades/4007.zcml         | 25 ++++++++++++++++
 .../EasyNewsletter/upgrades/4007/.gitkeep     |  0
 .../EasyNewsletter/upgrades/4007/metadata.txt |  0
 src/Products/EasyNewsletter/upgrades/v4007.py | 14 +++++++++
 6 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 src/Products/EasyNewsletter/tests/test_upgrade_step_4007.py
 create mode 100644 src/Products/EasyNewsletter/upgrades/4007.zcml
 create mode 100644 src/Products/EasyNewsletter/upgrades/4007/.gitkeep
 create mode 100644 src/Products/EasyNewsletter/upgrades/4007/metadata.txt
 create mode 100644 src/Products/EasyNewsletter/upgrades/v4007.py

diff --git a/src/Products/EasyNewsletter/profiles/default/metadata.xml b/src/Products/EasyNewsletter/profiles/default/metadata.xml
index 4cfe4749..45bf866d 100644
--- a/src/Products/EasyNewsletter/profiles/default/metadata.xml
+++ b/src/Products/EasyNewsletter/profiles/default/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <metadata>
-  <version>4006</version>
+  <version>4007</version>
   <dependencies>
     <dependency>profile-plone.app.dexterity:default</dependency>
   </dependencies>
diff --git a/src/Products/EasyNewsletter/tests/test_upgrade_step_4007.py b/src/Products/EasyNewsletter/tests/test_upgrade_step_4007.py
new file mode 100644
index 00000000..58c3c5a9
--- /dev/null
+++ b/src/Products/EasyNewsletter/tests/test_upgrade_step_4007.py
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+from plone.app.testing import setRoles
+from plone.app.testing import TEST_USER_ID
+# from Products.EasyNewsletter.testing import PRODUCTS_EASYNEWSLETTER_FUNCTIONAL_TESTING
+from Products.EasyNewsletter.testing import PRODUCTS_EASYNEWSLETTER_INTEGRATION_TESTING
+
+import unittest
+
+
+class UpgradeStepIntegrationTest(unittest.TestCase):
+
+    layer = PRODUCTS_EASYNEWSLETTER_INTEGRATION_TESTING
+
+    def setUp(self):
+        self.portal = self.layer['portal']
+        setRoles(self.portal, TEST_USER_ID, ['Manager'])
+
+    def test_upgrade_step(self):
+        # dummy, add tests here
+        self.assertTrue(True)
+
+
+# class UpgradeStepFunctionalTest(unittest.TestCase):
+#
+#     layer = PRODUCTS_EASYNEWSLETTER_FUNCTIONAL_TESTING
+#
+#     def setUp(self):
+#         self.portal = self.layer['portal']
+#         setRoles(self.portal, TEST_USER_ID, ['Manager'])
diff --git a/src/Products/EasyNewsletter/upgrades/4007.zcml b/src/Products/EasyNewsletter/upgrades/4007.zcml
new file mode 100644
index 00000000..06be3d90
--- /dev/null
+++ b/src/Products/EasyNewsletter/upgrades/4007.zcml
@@ -0,0 +1,25 @@
+<configure xmlns="http://namespaces.zope.org/zope"
+  xmlns:gs="http://namespaces.zope.org/genericsetup">
+
+  <gs:registerProfile name="4007"
+    title="Update resource registry entries, remove resources, only bundles are needed now."
+    directory="4007"
+    description='Configuration for version 4007'
+    for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
+    provides="Products.GenericSetup.interfaces.EXTENSION" />
+
+  <gs:upgradeSteps source="4006"
+    destination="4007"
+    profile="Products.EasyNewsletter:default">
+
+    <gs:upgradeStep title="Update resource registry entries, remove resources, only bundles are needed now."
+      description=""
+      handler=".v4007.upgrade" />
+
+    <gs:upgradeDepends title="Update resource registry entries, remove resources, only bundles are needed now. (GS profile)"
+      description=""
+      import_profile="Products.EasyNewsletter.upgrades:4007" />
+
+  </gs:upgradeSteps>
+
+</configure>
diff --git a/src/Products/EasyNewsletter/upgrades/4007/.gitkeep b/src/Products/EasyNewsletter/upgrades/4007/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/src/Products/EasyNewsletter/upgrades/4007/metadata.txt b/src/Products/EasyNewsletter/upgrades/4007/metadata.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/src/Products/EasyNewsletter/upgrades/v4007.py b/src/Products/EasyNewsletter/upgrades/v4007.py
new file mode 100644
index 00000000..9cc154e3
--- /dev/null
+++ b/src/Products/EasyNewsletter/upgrades/v4007.py
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+
+from . import logger
+
+
+from .base import reload_gs_profile
+# from plone import api
+
+
+def upgrade(setup_tool=None):
+    """
+    """
+    logger.info("Running upgrade (Python): Update resource registry entries, remove resources, only bundles are needed now.")
+    reload_gs_profile(setup_tool)

From e7240f09fb8dbb3f6081ccf573a6df71c595aa9b Mon Sep 17 00:00:00 2001
From: MrTango <md@derico.de>
Date: Fri, 22 Dec 2023 16:02:30 +0200
Subject: [PATCH 2/2] update resource registry in upgrade step

---
 .../profiles/default/registry.xml             |  7 ------
 .../EasyNewsletter/upgrades/4007/registry.xml | 22 +++++++++++++++++++
 src/Products/EasyNewsletter/upgrades/v4007.py |  4 ++--
 3 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 src/Products/EasyNewsletter/upgrades/4007/registry.xml

diff --git a/src/Products/EasyNewsletter/profiles/default/registry.xml b/src/Products/EasyNewsletter/profiles/default/registry.xml
index 022240d4..fb848e50 100644
--- a/src/Products/EasyNewsletter/profiles/default/registry.xml
+++ b/src/Products/EasyNewsletter/profiles/default/registry.xml
@@ -35,13 +35,6 @@
       </value>
   </record>
 
-  <records prefix="plone.resources/easynewsletter"
-           interface='Products.CMFPlone.interfaces.IResourceRegistry'>
-    <value key="css">
-      <element>++plone++easynewsletter/easynewsletter.less</element>
-    </value>
-  </records>
-
   <records
       interface="Products.CMFPlone.interfaces.IBundleRegistry"
       prefix="plone.bundles/easynewsletter">
diff --git a/src/Products/EasyNewsletter/upgrades/4007/registry.xml b/src/Products/EasyNewsletter/upgrades/4007/registry.xml
new file mode 100644
index 00000000..60d3c5d6
--- /dev/null
+++ b/src/Products/EasyNewsletter/upgrades/4007/registry.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<registry>
+
+        <records prefix="plone.resources/iframeResizer"
+                interface='Products.CMFPlone.interfaces.IResourceRegistry'
+                remove="true">
+        </records>
+
+        <records interface='Products.CMFPlone.interfaces.IResourceRegistry'
+                prefix="plone.resources/easynewsletter"
+                remove="true">
+        </records>
+
+        <records interface="Products.CMFPlone.interfaces.IBundleRegistry"
+                prefix="plone.bundles/easynewsletter">
+                <value key="enabled">True</value>
+                <value key="depends">plone</value>
+                <value key="csscompilation">++plone++easynewsletter/easynewsletter.css</value>
+                <value key="jscompilation">++resource++Products.EasyNewsletter.iframeResizer.min.js</value>
+        </records>
+
+</registry>
\ No newline at end of file
diff --git a/src/Products/EasyNewsletter/upgrades/v4007.py b/src/Products/EasyNewsletter/upgrades/v4007.py
index 9cc154e3..9cb9b51c 100644
--- a/src/Products/EasyNewsletter/upgrades/v4007.py
+++ b/src/Products/EasyNewsletter/upgrades/v4007.py
@@ -10,5 +10,5 @@
 def upgrade(setup_tool=None):
     """
     """
-    logger.info("Running upgrade (Python): Update resource registry entries, remove resources, only bundles are needed now.")
-    reload_gs_profile(setup_tool)
+    # logger.info("Running upgrade (Python): Update resource registry entries, remove resources, only bundles are needed now.")
+    # reload_gs_profile(setup_tool)