eea.coremetadata 3.7__zip → 4.0__zip

{eea.coremetadata-3.7/eea.coremetadata.egg-info → eea.coremetadata-4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eea.coremetadata
-Version: 3.7
+Version: 4.0
 Summary: An add-on for Plone
 Home-page: https://github.com/eea/eea.coremetadata
 Author: European Environment Agency: IDM2 A-Team
@@ -128,6 +128,18 @@ EEA_ - European Environment Agency (EU)
 Changelog
 =========
 
+4.0 - (2024-06-21)
+---------------------------
+* Change: fix(upgrade-script): add try except for KeyError brain.getObjects()
+  [ichim-david]
+* Fix: Other organisations default value
+  [iugin]
+
+3.8 - (2024-06-19)
+---------------------------
+* Change: Release
+  [avoinea]
+
 3.7 - (2024-04-09)
 ---------------------------
 * Change: updated Organizations taxonomy, added EMA.

{eea.coremetadata-3.7 → eea.coremetadata-4.0}/docs/HISTORY.txt

@@ -1,6 +1,18 @@
 Changelog
 =========
 
+4.0 - (2024-06-21)
+---------------------------
+* Change: fix(upgrade-script): add try except for KeyError brain.getObjects()
+  [ichim-david]
+* Fix: Other organisations default value
+  [iugin]
+
+3.8 - (2024-06-19)
+---------------------------
+* Change: Release
+  [avoinea]
+
 3.7 - (2024-04-09)
 ---------------------------
 * Change: updated Organizations taxonomy, added EMA.

{eea.coremetadata-3.7 → eea.coremetadata-4.0}/eea/coremetadata/behaviors/metadata.py

@@ -69,6 +69,7 @@ class CoreMetadata(MetadataBase):
     @property
     def other_organisations(self):
         """other_organisations getter"""
+
         if not getattr(self.context, "other_organisations", None):
             SITE_STRING = getSite().getId()
             organisations_env = "DEFAULT_ORGANISATIONS_" + SITE_STRING
@@ -82,6 +83,8 @@ class CoreMetadata(MetadataBase):
             if isinstance(DEFAULT_ORGANISATIONS, str):
                 if "," in DEFAULT_ORGANISATIONS:
                     DEFAULT_ORGANISATIONS = DEFAULT_ORGANISATIONS.split(",")
+                elif not DEFAULT_ORGANISATIONS.strip():
+                    DEFAULT_ORGANISATIONS = []
                 else:
                     DEFAULT_ORGANISATIONS = [DEFAULT_ORGANISATIONS]
 

{eea.coremetadata-3.7 → eea.coremetadata-4.0}/eea/coremetadata/configure.zcml

@@ -15,4 +15,9 @@
 
   <adapter factory=".indexer.temporal_coverage_indexer" name="temporal_coverage" />
   <adapter factory=".indexer.data_provenance_indexer" name="data_provenance" />
+
+  <utility
+      name="eea.coremetadata.other_organisations"
+      component=".vocabulary.OtherOrganisationsVocabularyFactory"
+      />
 </configure>

{eea.coremetadata-3.7 → eea.coremetadata-4.0}/eea/coremetadata/metadata.py

@@ -26,7 +26,6 @@ from zope.interface import Invalid, implementer, invariant, provider
 from zope.schema import Choice, Datetime, Text, TextLine, Tuple
 from zope.schema.interfaces import IContextAwareDefaultFactory
 
-
 try:
     from plone.app.dexterity import _
     from plone.app.z3cform.widget import SelectFieldWidget
@@ -36,6 +35,12 @@ except ImportError:
     from z3c.form.browser.select import SelectFieldWidget
     from Products.CMFCore.permissions import ModifyPortalContent, View
 
+has_ajax_widget = True
+AjaxSelectFieldWidget = None
+try:
+    from plone.app.z3cform.widgets.select import AjaxSelectFieldWidget
+except ImportError:
+    has_ajax_widget = False
 
 _marker = []
 _zone = DateTime().timezone()
@@ -183,10 +188,18 @@ class ICoreMetadata(model.Schema):
             "of this item"
         ),  # noqa
         required=False,
-        value_type=Choice(vocabulary="organisations_vocabulary"),
-        defaultFactory=defaultOrganisations,
+        value_type=TextLine(),
+        missing_value=(),
+        default=tuple()
     )
 
+    if has_ajax_widget:
+        directives.widget(
+            "other_organisations",
+            AjaxSelectFieldWidget,
+            vocabulary="eea.coremetadata.other_organisations"
+        )
+
     directives.widget("topics", SelectFieldWidget)
     topics = Tuple(
         title=_("Topics"),

{eea.coremetadata-3.7 → eea.coremetadata-4.0}/eea/coremetadata/profiles/default/metadata.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metadata>
-  <version>3.5</version>
+  <version>4.0</version>
   <dependencies>
     <dependency>profile-collective.taxonomy:default</dependency>
   </dependencies>

{eea.coremetadata-3.7 → eea.coremetadata-4.0}/eea/coremetadata/upgrades/configure.zcml

@@ -78,4 +78,22 @@
     />
   </genericsetup:upgradeSteps>
 
+  <genericsetup:upgradeStep
+    title="Register index other_organisations in portal_catalog"
+    description=""
+    source="3.5"
+    destination="3.6"
+    handler=".to_36.to_36"
+    profile="eea.coremetadata:default"
+    />
+
+  <genericsetup:upgradeStep
+    title="Fix other_organisations default values"
+    description=""
+    source="3.6"
+    destination="4.0"
+    handler=".to_40.to_40"
+    profile="eea.coremetadata:default"
+    />
+
 </configure>

eea.coremetadata-4.0/eea/coremetadata/upgrades/to_36.py

@@ -0,0 +1,80 @@
+# pylint: disable=W1201, C0301, C0111, W0640, W1202
+# -*- coding: utf-8 -*-
+""" Upgrade to 3.6 """
+import logging
+
+from Products.CMFCore.utils import getToolByName
+from Products.PluginIndexes.KeywordIndex.KeywordIndex import KeywordIndex
+from Products.ZCatalog.Catalog import CatalogError
+from plone.dexterity.utils import iterSchemataForType
+from plone import api
+from Acquisition import aq_self
+from eea.coremetadata.behaviors.vocabulary import get_vocabulary
+from eea.coremetadata.metadata import ICoreMetadata
+
+logger = logging.getLogger("eea.coremetadata.upgrade")
+
+VOCAB_NAME = "collective.taxonomy.eeaorganisationstaxonomy"
+INDEX_NAME = "other_organisations"
+OLD_INDEX_NAME = "taxonomy_eeaorganisationstaxonomy"
+
+
+def to_36(context):
+    catalog = getToolByName(context.aq_parent, "portal_catalog")
+
+    idx_object = KeywordIndex(INDEX_NAME)
+
+    try:
+        catalog.addIndex(INDEX_NAME, idx_object)
+    except CatalogError:
+        logging.info(
+            "Index {0} already exists, we hope it is proper configured".format(  # noqa: E501
+                INDEX_NAME
+            )  # noqa: E501
+        )
+
+    types = getToolByName(context, 'portal_types').listTypeInfo()
+    migrated_types = []
+
+    for _type in types:
+        portal_type = _type.getId()
+        for schemata in iterSchemataForType(portal_type):
+            if schemata is ICoreMetadata:
+                migrated_types.append(portal_type)
+
+    vocabulary = get_vocabulary(context, VOCAB_NAME)
+
+    org_translated = {key: val if ord(
+        val[0]) < 255 else val[1:] for val, key in vocabulary}
+    brains = api.content.find(portal_type=migrated_types)
+
+    for brain in brains:
+        try:
+            obj = brain.getObject()
+        except KeyError:
+            logging.info("{0} was not found".format(brain.getURL(1)))
+            continue
+        obj = aq_self(obj)
+        orgs = getattr(obj, 'other_organisations', None)
+        logger.info("Check for (%s) - %s",
+                    brain.getURL(), obj.other_organisations)
+
+        if orgs:
+            translated = tuple([
+                org_translated[key] if key in org_translated else key
+                for key in orgs
+            ])
+            obj.other_organisations = translated
+            obj._p_changed = True
+            obj.reindexObject()
+            logger.info("Migrated organisations for obj (%s) - %s -> %s",
+                        brain.getURL(), orgs, obj.other_organisations)
+
+    catalog.reindexIndex(INDEX_NAME, idx_object)
+    try:
+        catalog.delIndex(OLD_INDEX_NAME)
+        logging.info("Old index {0} was deleted".format(INDEX_NAME))
+    except CatalogError:
+        logging.info("Old index {0} was not found".format(INDEX_NAME))
+
+    logger.info("Upgraded to 3.6")

eea.coremetadata-4.0/eea/coremetadata/upgrades/to_40.py

@@ -0,0 +1,61 @@
+# pylint: disable=W1201, C0301, C0111, W0640, W1202
+# -*- coding: utf-8 -*-
+""" Upgrade to 4.0 """
+import logging
+
+from Products.CMFCore.utils import getToolByName
+from plone.dexterity.utils import iterSchemataForType
+from plone import api
+from Acquisition import aq_self
+from eea.coremetadata.metadata import ICoreMetadata
+
+logger = logging.getLogger("eea.coremetadata.upgrade")
+
+INDEX_NAME = "other_organisations"
+
+
+def to_40(context):
+    catalog = getToolByName(context.aq_parent, "portal_catalog")
+
+    idx_object = catalog.Indexes[INDEX_NAME]
+
+    types = getToolByName(context, 'portal_types').listTypeInfo()
+    migrated_types = []
+
+    for _type in types:
+        portal_type = _type.getId()
+        for schemata in iterSchemataForType(portal_type):
+            if schemata is ICoreMetadata:
+                migrated_types.append(portal_type)
+
+    brains = api.content.find(portal_type=migrated_types)
+
+    for brain in brains:
+        try:
+            obj = brain.getObject()
+        except KeyError:
+            logging.info("{0} was not found".format(brain.getURL(1)))
+            continue
+        obj = aq_self(obj)
+        orgs = getattr(obj, 'other_organisations', None)
+        logger.info("Check for (%s) - %s",
+                    brain.getURL(), obj.other_organisations)
+
+        if orgs is None:
+            obj.other_organisations = tuple()
+            obj._p_changed = True
+            obj.reindexObject()
+            logger.info("Updated other organisations (%s) - empty",
+                        brain.getURL())
+        elif isinstance(orgs, tuple):
+            orgs_clean = tuple([term for term in orgs if len(term.strip())])
+            if orgs_clean and orgs != orgs_clean:
+                obj.other_organisations = orgs_clean
+                obj._p_changed = True
+                obj.reindexObject()
+                logger.info("Updated other organisations (%s) - %s -> %s",
+                            brain.getURL(), orgs, obj.other_organisations)
+
+    catalog.reindexIndex(INDEX_NAME, idx_object)
+
+    logger.info("Upgraded to 4.0")

eea.coremetadata-4.0/eea/coremetadata/version.txt

@@ -0,0 +1 @@
+4.0

eea.coremetadata-4.0/eea/coremetadata/vocabulary.py

@@ -0,0 +1,16 @@
+"""vocabularies"""
+from plone.app.vocabularies.catalog import KeywordsVocabulary as BKV
+from zope.interface import implementer
+from zope.schema.interfaces import IVocabularyFactory
+
+
+@implementer(IVocabularyFactory)
+class OtherOrganisationKeywords(BKV):
+    """Core metada other organisation keywords"""
+
+    def __init__(self, index):
+        self.keyword_index = index
+
+
+OtherOrganisationsVocabularyFactory = OtherOrganisationKeywords(
+    "other_organisations")

{eea.coremetadata-3.7 → eea.coremetadata-4.0/eea.coremetadata.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eea.coremetadata
-Version: 3.7
+Version: 4.0
 Summary: An add-on for Plone
 Home-page: https://github.com/eea/eea.coremetadata
 Author: European Environment Agency: IDM2 A-Team
@@ -128,6 +128,18 @@ EEA_ - European Environment Agency (EU)
 Changelog
 =========
 
+4.0 - (2024-06-21)
+---------------------------
+* Change: fix(upgrade-script): add try except for KeyError brain.getObjects()
+  [ichim-david]
+* Fix: Other organisations default value
+  [iugin]
+
+3.8 - (2024-06-19)
+---------------------------
+* Change: Release
+  [avoinea]
+
 3.7 - (2024-04-09)
 ---------------------------
 * Change: updated Organizations taxonomy, added EMA.

{eea.coremetadata-3.7 → eea.coremetadata-4.0}/eea.coremetadata.egg-info/SOURCES.txt

@@ -23,6 +23,7 @@ eea/coremetadata/metadata.py
 eea/coremetadata/profiles.zcml
 eea/coremetadata/setuphandlers.py
 eea/coremetadata/version.txt
+eea/coremetadata/vocabulary.py
 eea/coremetadata/behaviors/__init__.py
 eea/coremetadata/behaviors/configure.zcml
 eea/coremetadata/behaviors/metadata.py
@@ -174,4 +175,6 @@ eea/coremetadata/tests/test_doctests.py
 eea/coremetadata/upgrades/__init__.py
 eea/coremetadata/upgrades/configure.zcml
 eea/coremetadata/upgrades/to_20.py
-eea/coremetadata/upgrades/to_24.py
+eea/coremetadata/upgrades/to_24.py
+eea/coremetadata/upgrades/to_36.py
+eea/coremetadata/upgrades/to_40.py

eea.coremetadata-3.7/eea/coremetadata/version.txt

@@ -1 +0,0 @@
-3.7