Merge pull request #8 from eea/develop

Release

Jenkinsfile

@@ -82,65 +82,11 @@ pipeline {
     stage('Tests') {
       steps {
         parallel(
-
-          // "WWW": {
-          //   node(label: 'docker') {
-          //     script {
-          //       try {
-          //         sh '''docker run -i --name="$BUILD_TAG-www" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/www-devel /debug.sh coverage'''
-          //         sh '''mkdir -p xunit-reports; docker cp $BUILD_TAG-www:/plone/instance/parts/xmltestreport/testreports/. xunit-reports/'''
-          //         stash name: "xunit-reports", includes: "xunit-reports/*.xml"
-          //         sh '''docker cp $BUILD_TAG-www:/plone/instance/src/$GIT_NAME/coverage.xml coverage.xml'''
-          //         stash name: "coverage.xml", includes: "coverage.xml"
-          //       } finally {
-          //         sh '''docker rm -v $BUILD_TAG-www'''
-          //       }
-          //       junit 'xunit-reports/*.xml'
-          //     }
-          //   }
-          // },
-
-
-//           "KGS": {
-//             node(label: 'docker') {
-//               sh '''docker run -i --rm --name="$BUILD_TAG-kgs" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/kgs-devel /debug.sh bin/test --test-path /plone/instance/src/$GIT_NAME -v -vv -s $GIT_NAME'''
-//             }
-//           },
-
-          "Plone4": {
-            node(label: 'docker') {
-              sh '''docker run -i --rm --name="$BUILD_TAG-plone4" -e VERSIONS="$VERSIONS" -e GIT_BRANCH="$BRANCH_NAME" -e ADDONS="$GIT_NAME" -e DEVELOP="src/$GIT_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/plone-test:4 -v -vv -s $GIT_NAME'''
-            }
-          },
-
-          "Plone5 & Python2": {
-            node(label: 'docker') {
-              sh '''docker run -i --rm --name="$BUILD_TAG-plone5" -e GIT_BRANCH="$BRANCH_NAME" -e ADDONS="$GIT_NAME" -e DEVELOP="src/$GIT_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/plone-test:5 -v -vv -s $GIT_NAME'''
-            }
-          },
-
           "Plone5 & Python3": {
             node(label: 'docker') {
               sh '''docker run -i --rm --name="$BUILD_TAG-python3" -e GIT_BRANCH="$BRANCH_NAME" -e ADDONS="$GIT_NAME" -e DEVELOP="src/$GIT_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/plone-test:5-python3 -v -vv -s $GIT_NAME'''
             }
           },
-          /*
-          "PloneSaaS": {
-            node(label: 'docker') {
-              script {
-               try {
-                  sh '''docker pull eeacms/plonesaas-devel; docker run -i --name="$BUILD_TAG-plonesaas" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/plonesaas-devel /debug.sh coverage'''
-                  sh '''mkdir -p xunit-reports; docker cp $BUILD_TAG-plonesaas:/plone/instance/parts/xmltestreport/testreports/. xunit-reports/'''
-                  stash name: "xunit-reports", includes: "xunit-reports/*.xml"
-                  sh '''docker cp $BUILD_TAG-plonesaas:/plone/instance/src/$GIT_NAME/coverage.xml coverage.xml'''
-                  stash name: "coverage.xml", includes: "coverage.xml"
-                } finally {
-                  sh '''docker rm -v $BUILD_TAG-plonesaas'''
-                }
-                junit 'xunit-reports/*.xml'
-              }
-            }
-          },*/
         )
       }
     }

docs/HISTORY.txt

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+2.0 - (2024-06-01)
+---------------------------
+* Breaking: Drop Plone 4 GenericSetup profile
+  [avoinea - refs #151690]
+* Breaking: Rename Editing Progress ControlPanel and registry
+  [avoinea - refs #151690]
+
 1.5 - (2023-06-01)
 ---------------------------
 * Feature: Plone 6 added editing progress controlpanel 

eea/progress/editing/browser/configure.zcml

@@ -1,7 +1,6 @@
 <configure
   xmlns="http://namespaces.zope.org/zope"
   xmlns:browser="http://namespaces.zope.org/browser"
-  xmlns:zcml="http://namespaces.zope.org/zcml"
   i18n_domain="eea">
 
   <browser:page
@@ -14,17 +13,11 @@
   />
 
   <browser:page
-      zcml:condition="have plone-60"
-      name="editingprogress-controlpanel"
+      name="progress.editing.controlpanel"
       for="Products.CMFPlone.interfaces.IPloneSiteRoot"
       class=".controlpanel.EditingProgressControlPanelFormWrapper"
       permission="cmf.ManagePortal"
       layer="eea.progress.editing.interfaces.IEEAEditingProgressLayer"
       />
 
-  <adapter
-      zcml:condition="have plone-60"
-      factory="eea.progress.editing.browser.controlpanel.EditingProgressRegistryConfigletPanel"
-      name="editingprogress-controlpanel" />
-
 </configure>

eea/progress/editing/browser/controlpanel.py

@@ -3,52 +3,20 @@
 """
 import logging
 
-from plone.app.registry.browser.controlpanel import ControlPanelFormWrapper, \
-    RegistryEditForm
-from plone.restapi.controlpanels import RegistryConfigletPanel
-from zope.component import adapter
-from zope.interface import Interface
-
-try:
-    from plone.schema import JSONField
-except ImportError:
-    from zope.schema import Dict as JSONField
-
+from plone.app.registry.browser.controlpanel import ControlPanelFormWrapper
+from plone.app.registry.browser.controlpanel import RegistryEditForm
+from eea.progress.editing.interfaces import IEditingProgressSettings
 
 logger = logging.getLogger("eea.progress.editing")
 
 
-class IEditingProgressSettings(Interface):
-    """ Editing progress schema """
-
-    progress = JSONField(
-        title="Progress",
-        description="Editing progress configuration",
-        required=False,
-        default={},
-        missing_value={},
-    )
-
-
 class EditingProgressRegistryEditForm(RegistryEditForm):
     """ Editing progress form """
     schema = IEditingProgressSettings
     schema_prefix = "editing"
-    label = "Editing progress Settings"
+    label = "Editing progress"
 
 
 class EditingProgressControlPanelFormWrapper(ControlPanelFormWrapper):
     """ Editing progress wrapper """
     form = EditingProgressRegistryEditForm
-
-
-@adapter(Interface, Interface)
-class EditingProgressRegistryConfigletPanel(RegistryConfigletPanel):
-    """ Volto control panel """
-
-    schema = IEditingProgressSettings
-    schema_prefix = "editing"
-    configlet_id = "editingprogress-controlpanel"
-    configlet_category_id = "Products"
-    title = "Editing Progress Settings"
-    group = "Products"

eea/progress/editing/interfaces.py

@@ -4,9 +4,13 @@
     >>> sandbox = portal._getOb('sandbox')
 
 """
-
+try:
+    from plone.schema import JSONField
+except ImportError:
+    from zope.schema import Dict as JSONField
 from zope.publisher.interfaces.browser import IDefaultBrowserLayer
 from zope.interface import Interface
+from eea.progress.editing import EEAMessageFactory as _
 
 
 class IBaseObject(Interface):
@@ -28,6 +32,13 @@ class IEditingProgressState(Interface):
     """
 
 
-#
-# Adapters
-#
+class IEditingProgressSettings(Interface):
+    """ Editing progress schema """
+
+    progress = JSONField(
+        title=_(u"Progress"),
+        description=_(u"Editing progress configuration"),
+        required=False,
+        default={},
+        missing_value={},
+    )

eea/progress/editing/profiles.zcml

@@ -25,20 +25,9 @@
       post_handler=".setuphandlers.uninstall"
       />
 
-  <genericsetup:registerProfile
-      zcml:condition="have plone-60"
-      name="plone6"
-      title="eea.progress.editing"
-      directory="profiles/plone6"
-      description="Installs the eea.progress.editing add-on."
-      provides="Products.GenericSetup.interfaces.EXTENSION"
-      post_handler=".setuphandlers.post_install"
-      />
-
   <utility
       factory=".setuphandlers.HiddenProfiles"
       name="eea.progress.editing-hiddenprofiles"
       />
 
-
 </configure>

eea/progress/editing/profiles/default/controlpanel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<object name="portal_controlpanel">
+  <configlet
+      title="Editing Progress"
+      action_id="eea.progress.editing"
+      appId="eea.progress.editing"
+      category="Products"
+      condition_expr=""
+      icon_expr=""
+
+      url_expr="string:${portal_url}/@@progress.editing.controlpanel"
+
+      visible="True">
+    <permission>Manage portal</permission>
+  </configlet>
+</object>

eea/progress/editing/profiles/default/metadata.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metadata>
-  <version>1.5</version>
+  <version>2.0</version>
 </metadata>

eea/progress/editing/profiles/plone6/registry.xml → eea/progress/editing/profiles/default/registry.xml

@@ -4,7 +4,7 @@
     i18n:domain="eea">
 
   <records
-      interface="eea.progress.editing.browser.controlpanel.IEditingProgressSettings"
+      interface="eea.progress.editing.interfaces.IEditingProgressSettings"
       prefix="editing" />
 
 </registry>

eea/progress/editing/restapi/configure.zcml

@@ -22,4 +22,8 @@
 
    <adapter factory=".get.EditingProgress" name="editing.progress" />
 
+  <adapter
+    factory=".controlpanel.Controlpanel"
+    name="progress.editing" />
+
 </configure>

eea/progress/editing/restapi/controlpanel.py

@@ -0,0 +1,19 @@
+""" Controlpanel API
+"""
+from zope.interface import Interface
+from zope.component import adapter
+from plone.restapi.controlpanels import RegistryConfigletPanel
+from eea.progress.editing.interfaces import IEEAEditingProgressLayer
+from eea.progress.editing.interfaces import IEditingProgressSettings
+
+
+@adapter(Interface, IEEAEditingProgressLayer)
+class Controlpanel(RegistryConfigletPanel):
+    """ Control Panel
+    """
+    schema = IEditingProgressSettings
+    schema_prefix = "editing"
+    configlet_id = "eea.progress.editing"
+    configlet_category_id = "Products"
+    title = "Editing Progress"
+    group = "Products"

eea/progress/editing/upgrades/configure.zcml

@@ -18,16 +18,15 @@
 
   <genericsetup:upgradeSteps
     zcml:condition="have plone-60"
-    source="1.0"
-    destination="1.5"
+    source="*"
+    destination="2.0"
     profile="eea.progress.editing:default">
 
     <genericsetup:upgradeDepends
-       title="Import all steps from eea.progress.editing Plone 6 profile"
-       import_profile="eea.progress.editing:plone6"
+       title="Import all steps from eea.progress.editing profile"
+       import_profile="eea.progress.editing:default"
       />
 
   </genericsetup:upgradeSteps>
 
-
 </configure>

eea/progress/editing/version.txt

@@ -1 +1 @@
-1.5
+2.0