wip: fix tests and co

src/collective/plausible/profiles/default/actions.xml

@@ -7,8 +7,7 @@
       <property name="description" i18n:translate=""/>
       <property name="url_expr">string:$object_url/@@plausible-view</property>
       <property name="icon_expr">string:activity</property>
-      <property name="available_expr">here/@@plausible-utils/add_link_object_action</property>
-      <!-- <property name="available_expr">python: getattr(object,"plausible_enabled", False) and getattr(object,"plausible_link_object_action", False)</property> -->
+      <property name="available_expr">here/@@plausible-utils/show_link_object_action</property>
       <property name="permissions">
         <element value="Add portal content"/>
       </property>

src/collective/plausible/profiles/testing/actions.xml

@@ -7,8 +7,7 @@
       <property name="description" i18n:translate=""/>
       <property name="url_expr">string:$object_url/@@plausible-view</property>
       <property name="icon_expr">string:activity</property>
-      <property name="available_expr">here/@@plausible-utils/add_link_object_action</property>
-      <!-- <property name="available_expr">python: getattr(object,"plausible_enabled", False) and getattr(object,"plausible_link_object_action", False)</property> -->
+      <property name="available_expr">here/@@plausible-utils/show_link_object_action</property>
       <property name="permissions">
         <element value="Add portal content"/>
       </property>

src/collective/plausible/tests/test_behavior_plausible_fields.py

@@ -233,7 +233,7 @@ def test_plausible_view_traversing(self):
         self.assertIn(self.iframe_plonesite, view_folder2())
         self.assertIn(self.iframe_plonesite, view_subfolder3())
 
-    def test_plausible_user_action(self):
+    def test_plausible_object_action(self):
 
         self.assertTrue(
             get_plausible_infos(self.portal)["plausible_link_object_action"]

src/collective/plausible/upgrades/1002/actions.xml

@@ -5,15 +5,13 @@
     <object meta_type="CMF Action" name="statistics" i18n:domain="collective.plausible" remove="True">
     </object>
   </object>
- </object>
   <object meta_type="CMF Action Category" name="object">
     <object meta_type="CMF Action" name="statistics" i18n:domain="collective.plausible">
       <property name="title" i18n:translate="">Statistics</property>
       <property name="description" i18n:translate=""/>
       <property name="url_expr">string:$object_url/@@plausible-view</property>
       <property name="icon_expr">string:activity</property>
-      <!-- <property name="available_expr"> python:getattr(object,"plausible_enabled", False) and getattr(object,"plausible_link_object_action", False)</property> -->
-      <property name="available_expr">python: object.plausible_enabled and object.plausible_link_object_action</property>
+      <property name="available_expr">here/@@plausible-utils/show_link_object_action</property>
       <property name="permissions">
         <element value="Add portal content"/>
       </property>

src/collective/plausible/upgrades/v1002.py

@@ -11,16 +11,8 @@
 
 def upgrade(setup_tool=None):
     """ """
-    logger.info("Running upgrade (Python): Add action linking to @@plausible-view")
+    logger.info("Running upgrade (Python): Replace action linking to @@plausible-view")
     registry = getUtility(IRegistry)
-    if "collective.plausible.link_user_action" not in registry.records:
-        registry_field = field.Bool(
-            title=_("Add a link in the user menu"),
-            description=_("Add a link to the statistics browser view in the user menu"),
-            default=True,
-            required=False,
-            readonly=False,
-        )
-        registry_record = Record(registry_field)
-        registry.records["collective.plausible.link_user_action"] = registry_record
+    if "collective.plausible.link_user_action" in registry.records:
+        del registry.records["collective.plausible.link_user_action"]
     reload_gs_profile(setup_tool)

src/collective/plausible/views/configure.zcml

@@ -19,7 +19,7 @@
     for="*"
     class=".plausible_utils.PlausibleUtilsView"
     permission="zope2.View"
-    allowed_attributes="is_plausible_set add_link_object_action get_plausible_instance_healthcheck"
+    allowed_attributes="is_plausible_set add_link_object_action show_link_object_action get_plausible_instance_healthcheck"
     layer="collective.plausible.interfaces.ICollectivePlausibleLayer"
     />
 

src/collective/plausible/views/plausible_utils.py

@@ -31,6 +31,9 @@ def add_link_object_action(self):
         # __import__("pdb").set_trace()
         return get_plausible_infos(self).get("plausible_link_object_action", False)
 
+    def show_link_object_action(self):
+        return self.add_link_object_action() and self.is_plausible_set()
+
     @property
     def get_plausible_instance_healthcheck(self):
         vars = get_plausible_infos(self)