IMS Indicator on new version should update links to figures 282960

eea/dexterity/indicators/contentrules/actions.py

@@ -17,6 +17,7 @@
 from plone.app.contentrules.browser.formhelper import (
     NullAddForm,
 )
+from plone.app.uuid.utils import uuidToObject
 from plone.contentrules.rule.interfaces import IExecutable, IRuleElementData
 from zope import schema
 from zope.component import adapter
@@ -62,12 +63,18 @@ def __call__(self):
         elif oid.endswith(".1"):
             old_id = oid.replace(".1", "", 1)
             new_id = old_id + "-%d" % time()
-
         if not (old_id and new_id):
             return True
-
         try:
-            old_version = parent[old_id]
+            if (
+                old_id not in parent and
+                hasattr(obj, 'copied_from') and
+                obj.copied_from
+            ):
+                old_version = uuidToObject(obj.copied_from)
+                obj.copied_from = ""
+            else:
+                old_version = parent[old_id]
             api.content.transition(
                 obj=old_version,
                 transition="markForDeletion",

eea/dexterity/indicators/contentrules/version.py

@@ -1,15 +1,22 @@
 """Copy action for content rules."""
+
+from urllib.parse import urlparse
 from Acquisition import aq_base
 from OFS.event import ObjectClonedEvent
 from OFS.SimpleItem import SimpleItem
 import OFS.subscribers
+from plone.restapi.blocks import visit_blocks
 from plone.app.contentrules import PloneMessageFactory as _
 from plone.app.contentrules.actions import ActionAddForm
 from plone.app.contentrules.actions import ActionEditForm
 from plone.app.contentrules.browser.formhelper import ContentRuleFormWrapper
 from plone.app.vocabularies.catalog import CatalogSource
 from plone.contentrules.rule.interfaces import IExecutable
 from plone.contentrules.rule.interfaces import IRuleElementData
+from plone.restapi.serializer.utils import uid_to_url
+from plone.restapi.deserializer.utils import path2uid
+from plone import api
+
 try:
     from plone.base.utils import pretty_title_or_id
 except ImportError:
@@ -21,9 +28,40 @@
 from zope import schema
 from zope.component import adapter
 from zope.event import notify
-from zope.interface import implementer
-from zope.interface import Interface
-from zope.lifecycleevent import ObjectCopiedEvent
+from zope.interface import implementer, Interface
+from zope.lifecycleevent import ObjectCopiedEvent, modified
+
+
+def getLink(path):
+    """
+    Get link
+    """
+
+    URL = urlparse(path)
+
+    if URL.netloc.startswith("localhost") and URL.scheme:
+        return path.replace(URL.scheme + "://" + URL.netloc, "")
+    return path
+
+
+def draftExistsFor(originalObj):
+    """
+    Check if an indicator has a draft already created.
+    """
+    catalog = api.portal.get_tool("portal_catalog")
+
+    origUid = originalObj.UID()
+    results = catalog.searchResults(
+        portal_type="ims_indicator",
+        copied_from=origUid,
+    )
+
+    for brain in results:
+        if hasattr(brain, 'UID') and brain.UID != origUid:
+            obj = brain.getObject()
+            if hasattr(obj, 'copied_from') and obj.copied_from == origUid:
+                return True
+    return False
 
 
 class ICopyAction(Interface):
@@ -75,11 +113,13 @@ def __init__(self, context, element, event):
         self.event = event
 
     def __call__(self):
+
         portal_url = getToolByName(self.context, "portal_url", None)
         if portal_url is None:
             return False
 
         obj = self.event.object
+        previous_obj_path = obj.absolute_url_path()
 
         path = self.element.target_folder
         change_note = self.element.change_note
@@ -100,7 +140,7 @@ def __call__(self):
 
         old_id = obj.getId()
         new_id = self.generate_id(target, old_id)
-        if not new_id.endswith('.1'):
+        if not new_id.endswith(".1") or draftExistsFor(obj):
             # Version already exists, redirect to it - refs #279130
             return True
 
@@ -123,14 +163,30 @@ def __call__(self):
         obj.wl_clearLocks()
 
         obj._postCopy(target, op=0)
+        try:
+            obj.copied_from = orig_obj.UID()
+        except Exception as e:
+            self.error(obj, str(e))
 
         OFS.subscribers.compatibilityCall("manage_afterClone", obj, obj)
 
         notify(ObjectClonedEvent(obj))
 
-        pr = getToolByName(obj, 'portal_repository')
+        pr = getToolByName(obj, "portal_repository")
         pr.save(obj=obj, comment=change_note)
-
+        # CHANGE URL OF FIGURES TO THE NEW DRAFT VERSION
+        for block_data in visit_blocks(obj, obj.blocks):
+            if (block_data.get("@type") == "embed_content" and
+                    "url" in block_data):
+                url = uid_to_url(block_data["url"])
+                if previous_obj_path in url:
+                    url = url.replace(
+                        previous_obj_path,
+                        previous_obj_path + ".1"
+                    )
+                    url = path2uid(context=self.context, link=getLink(url))
+                    block_data["url"] = url
+        modified(obj)
         return True
 
     def error(self, obj, error):
@@ -169,6 +225,7 @@ class CopyAddForm(ActionAddForm):
 
 class CopyAddFormView(ContentRuleFormWrapper):
     """A wrapper for the add form."""
+
     form = CopyAddForm
 
 
@@ -186,4 +243,5 @@ class CopyEditForm(ActionEditForm):
 
 class CopyEditFormView(ContentRuleFormWrapper):
     """A wrapper for the edit form."""
+
     form = CopyEditForm

eea/dexterity/indicators/interfaces.py

@@ -14,6 +14,7 @@
 from zope.interface import provider, Interface
 from zope.publisher.interfaces.browser import IDefaultBrowserLayer
 from zope.schema import Int
+from zope import schema
 
 
 class IEeaDexterityIndicatorsLayer(IDefaultBrowserLayer):
@@ -42,6 +43,7 @@ class IIndicatorMetadata(model.Schema):
             "topics",
             "temporal_coverage",
             "geo_coverage",
+            "copied_from"
         ],
     )
 
@@ -76,6 +78,12 @@ class IIndicatorMetadata(model.Schema):
         default={"readOnly": True, "geolocation": []},
     )
 
+    copied_from = schema.TextLine(
+        title=_("Original Parent UID"),
+        required=False,
+    )
+
+    directives.omitted("copied_from")
     #
     # Supporting information
     #