IADBXCIGB-77 / hotfix group and organization follow actions

Author: aleks-iv

ckanext/idb_theme/plugin.py

@@ -14,6 +14,7 @@
 
 
 @tk.blanket.helpers
+@tk.blanket.blueprints
 @tk.blanket.config_declarations
 class IdbThemePlugin(ITheme, p.SingletonPlugin):
     @override

ckanext/idb_theme/tests/test_follow.py

@@ -0,0 +1,43 @@
+from __future__ import annotations
+
+import pytest
+
+from ckan.lib.helpers import url_for
+from ckan.tests import factories
+
+pytestmark = [
+    pytest.mark.usefixtures("with_plugins", "clean_db"),
+    pytest.mark.ckan_config("ckan.auth.public_user_details", False),
+]
+
+
+def test_non_admin_can_follow_and_unfollow_group(app):
+    user = factories.User()
+    group = factories.Group()
+    app.set_session_user(user["name"])
+
+    response = app.post(url_for("idb_theme.group_follow", id=group["id"]))
+
+    assert response.status_code == 200
+    assert "Unfollow" in response
+
+    response = app.post(url_for("idb_theme.group_unfollow", id=group["id"]))
+
+    assert response.status_code == 200
+    assert "Follow" in response
+
+
+def test_non_admin_can_follow_and_unfollow_organization(app):
+    user = factories.User()
+    organization = factories.Organization()
+    app.set_session_user(user["name"])
+
+    response = app.post(url_for("idb_theme.organization_follow", id=organization["id"]))
+
+    assert response.status_code == 200
+    assert "Unfollow" in response
+
+    response = app.post(url_for("idb_theme.organization_unfollow", id=organization["id"]))
+
+    assert response.status_code == 200
+    assert "Follow" in response

ckanext/idb_theme/themes/idb/templates/group/snippets/info.html

@@ -57,9 +57,9 @@
                                 {% if error_message %}
                                     <div class="alert alert-danger">{{ error_message }}</div>
                                 {% elif am_following %}
-                                    {{ ui.button(ui.icon("circle-minus", style="solid") ~ _("Unfollow"), style="danger", hx={"target": "#group-info", "post": h.url_for('group.unfollow', id=group.id)}) }}
+                                    {{ ui.button(ui.icon("circle-minus", style="solid") ~ _("Unfollow"), style="danger", hx={"target": "#group-info", "post": h.url_for('idb_theme.group_unfollow', id=group.id)}) }}
                                 {% else %}
-                                    {{ ui.button(ui.icon("circle-plus", style="solid") ~ _("Follow"), style="success", hx={"target": "#group-info", "post": h.url_for('group.follow', id=group.id)}) }}
+                                    {{ ui.button(ui.icon("circle-plus", style="solid") ~ _("Follow"), style="success", hx={"target": "#group-info", "post": h.url_for('idb_theme.group_follow', id=group.id)}) }}
                                 {%- endif -%}
 
                             {% endif %}

ckanext/idb_theme/themes/idb/templates/organization/snippets/info.html

@@ -76,9 +76,9 @@
                                 {% if error_message %}
                                     <div class="alert alert-danger">{{ error_message }}</div>
                                 {% elif am_following %}
-                                    {{ ui.button(ui.icon("circle-minus", style="solid") ~ _("Unfollow"), style="danger", hx={"target": "#organization-info", "post": h.url_for('organization.unfollow', id=organization.id)}) }}
+                                    {{ ui.button(ui.icon("circle-minus", style="solid") ~ _("Unfollow"), style="danger", hx={"target": "#organization-info", "post": h.url_for('idb_theme.organization_unfollow', id=organization.id)}) }}
                                 {% else %}
-                                    {{ ui.button(ui.icon("circle-plus", style="solid") ~ _("Follow"), style="success", hx={"target": "#organization-info", "post": h.url_for('organization.follow', id=organization.id)}) }}
+                                    {{ ui.button(ui.icon("circle-plus", style="solid") ~ _("Follow"), style="success", hx={"target": "#organization-info", "post": h.url_for('idb_theme.organization_follow', id=organization.id)}) }}
 
                                 {% endif %}
                             {% endif %}

ckanext/idb_theme/views.py

@@ -0,0 +1,74 @@
+from __future__ import annotations
+
+from flask import Blueprint
+
+import ckan.plugins.toolkit as tk
+from ckan.common import current_user
+
+__all__ = ["bp"]
+
+bp = Blueprint("idb_theme", __name__, url_prefix="/idb-theme")
+
+
+# Temporary hotfix for https://github.com/ckan/ckan/pull/9394.
+def _follow_group(id: str, *, is_organization: bool, follow: bool) -> str:
+    group_type = "organization" if is_organization else "group"
+    data_dict = {
+        "id": id,
+        "include_datasets": True,
+        "include_users": False,
+    }
+    if not follow:
+        data_dict["include_followers"] = True
+
+    extra_vars = {
+        "current_user": current_user,
+        "show_nums": True,
+    }
+
+    try:
+        action = "organization_show" if is_organization else "group_show"
+        group_dict = tk.get_action(action)({}, data_dict)
+    except (tk.ObjectNotFound, tk.NotAuthorized):
+        msg = tk._(f"{group_type} not found or you have no permission to view it")
+        tk.abort(404, msg)
+
+    error_message = ""
+    try:
+        if follow:
+            tk.get_action("follow_group")({}, {"id": id})
+            extra_vars["am_following"] = True
+        else:
+            tk.get_action("unfollow_group")({}, {"id": id})
+            extra_vars["am_following"] = False
+    except tk.ValidationError as error:
+        error_message = error.error_summary
+
+    extra_vars["error_message"] = error_message
+
+    if is_organization:
+        extra_vars["organization"] = group_dict
+        return tk.render("organization/snippets/info.html", extra_vars)
+
+    extra_vars["group"] = group_dict
+    return tk.render("group/snippets/info.html", extra_vars)
+
+
+@bp.post("/group/follow/<id>")
+def group_follow(id: str) -> str:
+    return _follow_group(id, is_organization=False, follow=True)
+
+
+@bp.post("/group/unfollow/<id>")
+def group_unfollow(id: str) -> str:
+    return _follow_group(id, is_organization=False, follow=False)
+
+
+@bp.post("/organization/follow/<id>")
+def organization_follow(id: str) -> str:
+    return _follow_group(id, is_organization=True, follow=True)
+
+
+@bp.post("/organization/unfollow/<id>")
+def organization_unfollow(id: str) -> str:
+    return _follow_group(id, is_organization=True, follow=False)