From 6fb60534d3c3cf7c0b129d1f4d4108cd566bd99c Mon Sep 17 00:00:00 2001
From: AleexGreen <alex.green@ontario.ca>
Date: Fri, 29 Mar 2024 17:43:10 +0000
Subject: [PATCH 01/13] Adds hx-get and hx-target to activity stream select and
 pagination

---
 .../activity/templates/snippets/activity_type_selector.html   | 4 ++--
 ckanext/activity/templates/snippets/pagination.html           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ckanext/activity/templates/snippets/activity_type_selector.html b/ckanext/activity/templates/snippets/activity_type_selector.html
index fe3abb44790..2d1b35974b2 100644
--- a/ckanext/activity/templates/snippets/activity_type_selector.html
+++ b/ckanext/activity/templates/snippets/activity_type_selector.html
@@ -14,11 +14,11 @@
     {{ _('Activity type') }}
   </label>
   <select id="activity_types_filter_select" class="form-select">
-    <option {% if not activity_types %}selected{% endif %} data-url="{{ h.url_for(blueprint, id=id) }}">
+    <option {% if not activity_types %}selected{% endif %} hx-get="{{ h.url_for(blueprint, id=id) }}" hx-target="body">
       {{ _('All activity types') }}
     </option>
     {% for type_ in activity_types %}
-      <option {% if activity_type == type_ %}selected{% endif %} data-url="{{ h.url_for(blueprint, id=id, activity_type=type_) }}">
+      <option {% if activity_type == type_ %}selected{% endif %} hx-get="{{ h.url_for(blueprint, id=id, activity_type=type_) }}" hx-target="body">
         {# TODO: Calling humanize gets complex when displaying orgs/groups since the activities also contains dataset activities #}
         {{ type_ | title }}
       </option>
diff --git a/ckanext/activity/templates/snippets/pagination.html b/ckanext/activity/templates/snippets/pagination.html
index 78e6053685b..130522321f0 100644
--- a/ckanext/activity/templates/snippets/pagination.html
+++ b/ckanext/activity/templates/snippets/pagination.html
@@ -3,10 +3,10 @@
 
 {% if newer_activities_url or older_activities_url %}
     <div id="activity_page_buttons" class="activity_buttons" style="margin-top: 25px;">
-        <a href="{{ newer_activities_url }}" class="{{ class_prev }}">
+        <a hx-get="{{ newer_activities_url }}" hx-target="body" class="{{ class_prev }}">
             {{ _('Newer activities') }}
         </a>
-        <a href="{{ older_activities_url }}" class="{{ class_next }}">
+        <a hx-get="{{ older_activities_url }}" hx-target="body" class="{{ class_next }}">
             {{ _('Older activities') }}
         </a>
     </div>

From ad200750c95a85c13e2b0ab5de54be4e02d770c7 Mon Sep 17 00:00:00 2001
From: AleexGreen <alex.green@ontario.ca>
Date: Mon, 1 Apr 2024 17:57:16 +0000
Subject: [PATCH 02/13] Pushes URL to browser location history and deletes
 javascript module

---
 ckanext/activity/assets/activity-stream.js    | 34 -------------------
 ckanext/activity/assets/webassets.yml         |  1 -
 .../snippets/activity_type_selector.html      |  6 ++--
 .../templates/snippets/pagination.html        |  4 +--
 4 files changed, 5 insertions(+), 40 deletions(-)
 delete mode 100644 ckanext/activity/assets/activity-stream.js

diff --git a/ckanext/activity/assets/activity-stream.js b/ckanext/activity/assets/activity-stream.js
deleted file mode 100644
index 69874ba0b44..00000000000
--- a/ckanext/activity/assets/activity-stream.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Activity stream
- * Handle the pagination for activity list
- *
- * Options
- * - page: current page number
- */	
-this.ckan.module('activity-stream', function($) {
-	return {
-		
-		/* Initialises the module setting up elements and event listeners.
-		 *
-		 * Returns nothing.
-		 */
-		initialize: function () {
-			$('#activity_types_filter_select').on(
-				'change',
-				this._onChangeActivityType
-			);
-		},
-
-		
-		/* Filter using the selected 
-		 *   activity type
-		 *
-		 * Returns nothing
-		 */
-		_onChangeActivityType: function (event) {
-			// event.preventDefault();
-			url = $("#activity_types_filter_select option:selected" ).data('url');
-			window.location = url;
-		},
-
-	};
-});
diff --git a/ckanext/activity/assets/webassets.yml b/ckanext/activity/assets/webassets.yml
index e762585c583..596cac565bb 100644
--- a/ckanext/activity/assets/webassets.yml
+++ b/ckanext/activity/assets/webassets.yml
@@ -6,7 +6,6 @@ activity:
       - base/main
   contents:
     - dashboard.js
-    - activity-stream.js
 
 activity-css:
   output: ckanext-activity/%(version)s_activity.css
diff --git a/ckanext/activity/templates/snippets/activity_type_selector.html b/ckanext/activity/templates/snippets/activity_type_selector.html
index 2d1b35974b2..fd294ce8b5c 100644
--- a/ckanext/activity/templates/snippets/activity_type_selector.html
+++ b/ckanext/activity/templates/snippets/activity_type_selector.html
@@ -9,16 +9,16 @@
   blueprint - blueprint to call when selecting an activity type to filter by (eg: dataset.activity)
 #}
 
-<div id="activity_types_filter" style="margin-bottom: 15px;" data-module="activity-stream">
+<div id="activity_types_filter" style="margin-bottom: 15px;">
   <label for="activity_types_filter_select" class="form-label">
     {{ _('Activity type') }}
   </label>
   <select id="activity_types_filter_select" class="form-select">
-    <option {% if not activity_types %}selected{% endif %} hx-get="{{ h.url_for(blueprint, id=id) }}" hx-target="body">
+    <option {% if not activity_types %}selected{% endif %} hx-get="{{ h.url_for(blueprint, id=id) }}" hx-target="body" hx-push-url="true">
       {{ _('All activity types') }}
     </option>
     {% for type_ in activity_types %}
-      <option {% if activity_type == type_ %}selected{% endif %} hx-get="{{ h.url_for(blueprint, id=id, activity_type=type_) }}" hx-target="body">
+      <option {% if activity_type == type_ %}selected{% endif %} hx-get="{{ h.url_for(blueprint, id=id, activity_type=type_) }}" hx-target="body" hx-push-url="true">
         {# TODO: Calling humanize gets complex when displaying orgs/groups since the activities also contains dataset activities #}
         {{ type_ | title }}
       </option>
diff --git a/ckanext/activity/templates/snippets/pagination.html b/ckanext/activity/templates/snippets/pagination.html
index 130522321f0..d0aa4bdc952 100644
--- a/ckanext/activity/templates/snippets/pagination.html
+++ b/ckanext/activity/templates/snippets/pagination.html
@@ -3,10 +3,10 @@
 
 {% if newer_activities_url or older_activities_url %}
     <div id="activity_page_buttons" class="activity_buttons" style="margin-top: 25px;">
-        <a hx-get="{{ newer_activities_url }}" hx-target="body" class="{{ class_prev }}">
+        <a hx-get="{{ newer_activities_url }}" hx-target="body" hx-push-url="true" class="{{ class_prev }}">
             {{ _('Newer activities') }}
         </a>
-        <a hx-get="{{ older_activities_url }}" hx-target="body" class="{{ class_next }}">
+        <a hx-get="{{ older_activities_url }}" hx-target="body" hx-push-url="true" class="{{ class_next }}">
             {{ _('Older activities') }}
         </a>
     </div>

From ddfc6b28616758c1f60d72e6d06d8e07814fd9df Mon Sep 17 00:00:00 2001
From: AleexGreen <alex.green@ontario.ca>
Date: Mon, 1 Apr 2024 18:34:34 +0000
Subject: [PATCH 03/13] Add changes/8129.feature

---
 changes/8129.feature | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 changes/8129.feature

diff --git a/changes/8129.feature b/changes/8129.feature
new file mode 100644
index 00000000000..6a0b7530807
--- /dev/null
+++ b/changes/8129.feature
@@ -0,0 +1,2 @@
+Replace `activity-stream.js` module with htmx on the activity type select element filters.
+Use htmx to navigating to newer and older versions of activity stream
\ No newline at end of file

From 5f77202c8280b53f8c928efabef68ea9c93b3f4e Mon Sep 17 00:00:00 2001
From: AleexGreen <alex.green@ontario.ca>
Date: Mon, 1 Apr 2024 18:44:12 +0000
Subject: [PATCH 04/13] Initial commit


From 86798e8649f12ca610fa262cb37cc160353fe7cd Mon Sep 17 00:00:00 2001
From: Alex Green <aleexgreen16@gmail.com>
Date: Sat, 6 Apr 2024 14:44:54 -0400
Subject: [PATCH 05/13] Add changelog removal file

---
 changes/8129.feature | 4 ++--
 changes/8129.removal | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 changes/8129.removal

diff --git a/changes/8129.feature b/changes/8129.feature
index 6a0b7530807..e0a267ea9f7 100644
--- a/changes/8129.feature
+++ b/changes/8129.feature
@@ -1,2 +1,2 @@
-Replace `activity-stream.js` module with htmx on the activity type select element filters.
-Use htmx to navigating to newer and older versions of activity stream
\ No newline at end of file
+Use htmx on the activity type select element filters.
+Use htmx to navigate to newer and older versions of activity stream.
\ No newline at end of file
diff --git a/changes/8129.removal b/changes/8129.removal
new file mode 100644
index 00000000000..89d720ef932
--- /dev/null
+++ b/changes/8129.removal
@@ -0,0 +1 @@
+Remove `activity-stream.js` module
\ No newline at end of file

From 082c4aef5f6762202fde62e3752ff02dc7275b30 Mon Sep 17 00:00:00 2001
From: Alex Green <aleexgreen16@gmail.com>
Date: Sat, 6 Apr 2024 15:33:29 -0400
Subject: [PATCH 06/13] Change a tag to button tag

---
 ckanext/activity/templates/snippets/pagination.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ckanext/activity/templates/snippets/pagination.html b/ckanext/activity/templates/snippets/pagination.html
index d0aa4bdc952..b4e26f94222 100644
--- a/ckanext/activity/templates/snippets/pagination.html
+++ b/ckanext/activity/templates/snippets/pagination.html
@@ -3,11 +3,11 @@
 
 {% if newer_activities_url or older_activities_url %}
     <div id="activity_page_buttons" class="activity_buttons" style="margin-top: 25px;">
-        <a hx-get="{{ newer_activities_url }}" hx-target="body" hx-push-url="true" class="{{ class_prev }}">
+        <button hx-get="{{ newer_activities_url }}" hx-target="body" hx-push-url="true" class="{{ class_prev }}">
             {{ _('Newer activities') }}
-        </a>
-        <a hx-get="{{ older_activities_url }}" hx-target="body" hx-push-url="true" class="{{ class_next }}">
+        </button>
+        <button hx-get="{{ older_activities_url }}" hx-target="body" hx-push-url="true" class="{{ class_next }}">
             {{ _('Older activities') }}
-        </a>
+        </button>
     </div>
 {% endif %}

From 9df83dcda0e8f057f267774e117b318b981bfbc9 Mon Sep 17 00:00:00 2001
From: Alex Green <aleexgreen16@gmail.com>
Date: Sat, 6 Apr 2024 17:38:04 -0400
Subject: [PATCH 07/13] Use hx-boost instead of hx-get

---
 ckanext/activity/templates/snippets/pagination.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ckanext/activity/templates/snippets/pagination.html b/ckanext/activity/templates/snippets/pagination.html
index b4e26f94222..4b54cc6aa6c 100644
--- a/ckanext/activity/templates/snippets/pagination.html
+++ b/ckanext/activity/templates/snippets/pagination.html
@@ -2,12 +2,12 @@
 {% set class_next = "btn btn-default" if older_activities_url else "btn disabled" %}
 
 {% if newer_activities_url or older_activities_url %}
-    <div id="activity_page_buttons" class="activity_buttons" style="margin-top: 25px;">
-        <button hx-get="{{ newer_activities_url }}" hx-target="body" hx-push-url="true" class="{{ class_prev }}">
+    <div hx-boost="true" id="activity_page_buttons" class="activity_buttons" style="margin-top: 25px;">
+        <a href="{{ newer_activities_url }}" class="{{ class_prev }}">
             {{ _('Newer activities') }}
-        </button>
-        <button hx-get="{{ older_activities_url }}" hx-target="body" hx-push-url="true" class="{{ class_next }}">
+        </a>
+        <a href="{{ older_activities_url }}" class="{{ class_next }}">
             {{ _('Older activities') }}
-        </button>
+        </a>
     </div>
 {% endif %}

From b8530203b7aee80bfc9063cfaabf93ee2e210c2d Mon Sep 17 00:00:00 2001
From: Alex Green <aleexgreen16@gmail.com>
Date: Wed, 24 Apr 2024 23:48:06 +0000
Subject: [PATCH 08/13] Add read_base to group template, call activity_stream
 snippet from group read_base

---
 ckan/lib/plugins.py                             | 10 ++++++++++
 .../templates/group/activity_stream.html        | 17 +++++------------
 ckanext/activity/templates/group/read_base.html |  6 ++++++
 .../templates/organization/activity_stream.html | 17 +++++------------
 .../templates/organization/read_base.html       |  6 ++++++
 .../snippets/activity_type_selector.html        |  4 ++--
 ckanext/activity/views.py                       |  9 ++++++---
 7 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/ckan/lib/plugins.py b/ckan/lib/plugins.py
index 0a1809f43a8..40c9d6287d6 100644
--- a/ckan/lib/plugins.py
+++ b/ckan/lib/plugins.py
@@ -467,6 +467,13 @@ def edit_template(self) -> str:
         """
         return 'group/edit.html'
 
+    def activity_read_base_template(self) -> str:
+        """
+        Returns a string representing the location of the template to be
+        rendered for the activity stream page
+        """
+        return 'group/read_base.html'
+
     def activity_template(self) -> str:
         """
         Returns a string representing the location of the template to be
@@ -581,6 +588,9 @@ def edit_template(self) -> str:
     def activity_template(self) -> str:
         return 'organization/activity_stream.html'
 
+    def activity_template(self) -> str:
+        return 'organization/read_base.html'
+
 
 class DefaultTranslation(object):
     name: str
diff --git a/ckanext/activity/templates/group/activity_stream.html b/ckanext/activity/templates/group/activity_stream.html
index 0a7484e6c82..42840040a10 100644
--- a/ckanext/activity/templates/group/activity_stream.html
+++ b/ckanext/activity/templates/group/activity_stream.html
@@ -1,15 +1,8 @@
-{% extends "group/read_base.html" %}
+{% if activity_types is defined %}
+  {% snippet 'snippets/activity_type_selector.html', id=id, activity_type=activity_type, activity_types=activity_types, blueprint='activity.group_activity' %}
+{% endif %}
 
-{% block subtitle %}{{ _('Activity Stream') }} {{ g.template_title_delimiter }} {{ super() }}{% endblock %}
+{% snippet 'snippets/stream.html', activity_stream=activity_stream, id=id, object_type='group' %}
 
-{% block primary_content_inner %}
+{% snippet 'snippets/pagination.html', newer_activities_url=newer_activities_url, older_activities_url=older_activities_url %}
 
-  {% if activity_types is defined %}
-    {% snippet 'snippets/activity_type_selector.html', id=id, activity_type=activity_type, activity_types=activity_types, blueprint='activity.group_activity' %}
-  {% endif %}
-
-  {% snippet 'snippets/stream.html', activity_stream=activity_stream, id=id, object_type='group' %}
-
-  {% snippet 'snippets/pagination.html', newer_activities_url=newer_activities_url, older_activities_url=older_activities_url %}
-
-{% endblock %}
diff --git a/ckanext/activity/templates/group/read_base.html b/ckanext/activity/templates/group/read_base.html
index 03ce862195e..a50cb3a905e 100644
--- a/ckanext/activity/templates/group/read_base.html
+++ b/ckanext/activity/templates/group/read_base.html
@@ -1,6 +1,12 @@
 {% ckan_extends %}
 
+{% block subtitle %}{{ _('Activity Stream') }} {{ g.template_title_delimiter }} {{ super() }}{% endblock %}
+
 {% block content_primary_nav %}
   {{ super() }}
   {{ h.build_nav_icon('activity.group_activity', _('Activity Stream'), id=group_dict.name, offset=0, icon='clock') }}
 {% endblock content_primary_nav %}
+
+{% block primary_content_inner %}
+  {% snippet 'group/activity_stream.html', activity_stream=activity_stream, id=id, object_type='group', group_type=group_type, activity_types=activity_types, blueprint='activity.group_activity' %}
+{% endblock %}
diff --git a/ckanext/activity/templates/organization/activity_stream.html b/ckanext/activity/templates/organization/activity_stream.html
index c69b210c020..688fa727561 100644
--- a/ckanext/activity/templates/organization/activity_stream.html
+++ b/ckanext/activity/templates/organization/activity_stream.html
@@ -1,14 +1,7 @@
-{% extends "organization/read_base.html" %}
+{% if activity_types is defined %}
+  {% snippet 'snippets/activity_type_selector.html', id=id, activity_type=activity_type, activity_types=activity_types, blueprint='activity.organization_activity' %}
+{% endif %}
 
-{% block subtitle %}{{ _('Activity Stream') }} {{ g.template_title_delimiter }} {{ super() }}{% endblock %}
+{% snippet 'snippets/stream.html', activity_stream=activity_stream, id=id, object_type='organization' %}
 
-{% block primary_content_inner %}
-
-  {% if activity_types is defined %}
-    {% snippet 'snippets/activity_type_selector.html', id=id, activity_type=activity_type, activity_types=activity_types, blueprint='activity.organization_activity' %}
-  {% endif %}
-
-  {% snippet 'snippets/stream.html', activity_stream=activity_stream, id=id, object_type='organization', group_type=group_type %}
-
-  {% snippet 'snippets/pagination.html', newer_activities_url=newer_activities_url, older_activities_url=older_activities_url %}
-{% endblock %}
+{% snippet 'snippets/pagination.html', newer_activities_url=newer_activities_url, older_activities_url=older_activities_url %}
\ No newline at end of file
diff --git a/ckanext/activity/templates/organization/read_base.html b/ckanext/activity/templates/organization/read_base.html
index 2aa814f258f..7558464baae 100644
--- a/ckanext/activity/templates/organization/read_base.html
+++ b/ckanext/activity/templates/organization/read_base.html
@@ -1,6 +1,12 @@
 {% ckan_extends %}
 
+{% block subtitle %}{{ _('Activity Stream') }} {{ g.template_title_delimiter }}
+
 {% block content_primary_nav %}
   {{ super() }}
   {{ h.build_nav_icon('activity.organization_activity', _('Activity Stream'), id=group_dict.name, offset=0, icon='clock') }}
 {% endblock content_primary_nav %}
+
+{% block primary_content_inner %}
+  {% snippet 'organization/activity_stream.html', activity_stream=activity_stream, id=id, object_type='organization', group_type=group_type, activity_types=activity_types, blueprint='activity.organization_activity' %}
+{% endblock %}
\ No newline at end of file
diff --git a/ckanext/activity/templates/snippets/activity_type_selector.html b/ckanext/activity/templates/snippets/activity_type_selector.html
index fd294ce8b5c..b2778148a14 100644
--- a/ckanext/activity/templates/snippets/activity_type_selector.html
+++ b/ckanext/activity/templates/snippets/activity_type_selector.html
@@ -14,11 +14,11 @@
     {{ _('Activity type') }}
   </label>
   <select id="activity_types_filter_select" class="form-select">
-    <option {% if not activity_types %}selected{% endif %} hx-get="{{ h.url_for(blueprint, id=id) }}" hx-target="body" hx-push-url="true">
+    <option {% if not activity_types %}selected{% endif %} hx-get="{{ h.url_for(blueprint, id=id) }}" hx-target="closest .module-content" hx-push-url="true">
       {{ _('All activity types') }}
     </option>
     {% for type_ in activity_types %}
-      <option {% if activity_type == type_ %}selected{% endif %} hx-get="{{ h.url_for(blueprint, id=id, activity_type=type_) }}" hx-target="body" hx-push-url="true">
+      <option {% if activity_type == type_ %}selected{% endif %} hx-get="{{ h.url_for(blueprint, id=id, activity_type=type_) }}" hx-target="closest .module-content" hx-push-url="true">
         {# TODO: Calling humanize gets complex when displaying orgs/groups since the activities also contains dataset activities #}
         {{ type_ | title }}
       </option>
diff --git a/ckanext/activity/views.py b/ckanext/activity/views.py
index c298ae6c2cd..a973ed02e43 100644
--- a/ckanext/activity/views.py
+++ b/ckanext/activity/views.py
@@ -572,9 +572,12 @@ def group_activity(id: str, group_type: str) -> str:
         "older_activities_url": older_activities_url
     }
 
-    return tk.render(
-        _get_group_template("activity_template", group_type), extra_vars
-    )
+    if tk.request.htmx:
+        return tk.render(
+            _get_group_template("activity_template", group_type), extra_vars
+        )
+    else:
+        return tk.render(_get_group_template("activity_read_base_template", group_type), extra_vars)
 
 
 @bp.route(

From e2281e78e010d8983814c93c11dad8f0e4eda150 Mon Sep 17 00:00:00 2001
From: Alex Green <aleexgreen16@gmail.com>
Date: Thu, 25 Apr 2024 00:13:58 +0000
Subject: [PATCH 09/13] Add endblock names

---
 ckanext/activity/templates/group/read_base.html        | 4 ++--
 ckanext/activity/templates/organization/read_base.html | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ckanext/activity/templates/group/read_base.html b/ckanext/activity/templates/group/read_base.html
index a50cb3a905e..8cfdee9d90c 100644
--- a/ckanext/activity/templates/group/read_base.html
+++ b/ckanext/activity/templates/group/read_base.html
@@ -1,6 +1,6 @@
 {% ckan_extends %}
 
-{% block subtitle %}{{ _('Activity Stream') }} {{ g.template_title_delimiter }} {{ super() }}{% endblock %}
+{% block subtitle %}{{ _('Activity Stream') }} {{ g.template_title_delimiter }} {{ super() }}{% endblock subtitle %}
 
 {% block content_primary_nav %}
   {{ super() }}
@@ -9,4 +9,4 @@
 
 {% block primary_content_inner %}
   {% snippet 'group/activity_stream.html', activity_stream=activity_stream, id=id, object_type='group', group_type=group_type, activity_types=activity_types, blueprint='activity.group_activity' %}
-{% endblock %}
+{% endblock primary_content_inner %}
diff --git a/ckanext/activity/templates/organization/read_base.html b/ckanext/activity/templates/organization/read_base.html
index 7558464baae..2d51a183724 100644
--- a/ckanext/activity/templates/organization/read_base.html
+++ b/ckanext/activity/templates/organization/read_base.html
@@ -1,6 +1,6 @@
 {% ckan_extends %}
 
-{% block subtitle %}{{ _('Activity Stream') }} {{ g.template_title_delimiter }}
+{% block subtitle %}{{ _('Activity Stream') }} {{ g.template_title_delimiter }}{% endblock subtitle%}
 
 {% block content_primary_nav %}
   {{ super() }}
@@ -9,4 +9,4 @@
 
 {% block primary_content_inner %}
   {% snippet 'organization/activity_stream.html', activity_stream=activity_stream, id=id, object_type='organization', group_type=group_type, activity_types=activity_types, blueprint='activity.organization_activity' %}
-{% endblock %}
\ No newline at end of file
+{% endblock primary_content_inner %}
\ No newline at end of file

From 149ae67a45bcc3d481e46a966cc265afe4aa6350 Mon Sep 17 00:00:00 2001
From: Alex Green <aleexgreen16@gmail.com>
Date: Thu, 25 Apr 2024 00:17:00 +0000
Subject: [PATCH 10/13] Fix lint errors

---
 ckanext/activity/templates/snippets/activity_stream.html | 7 +++++++
 ckanext/activity/views.py                                | 5 ++++-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 ckanext/activity/templates/snippets/activity_stream.html

diff --git a/ckanext/activity/templates/snippets/activity_stream.html b/ckanext/activity/templates/snippets/activity_stream.html
new file mode 100644
index 00000000000..179fd7bb7eb
--- /dev/null
+++ b/ckanext/activity/templates/snippets/activity_stream.html
@@ -0,0 +1,7 @@
+{% if activity_types is defined %}
+  {% snippet 'snippets/activity_type_selector.html', id=id, activity_type=activity_type, activity_types=activity_types, blueprint=blueprint %}
+{% endif %}
+
+{% snippet 'snippets/stream.html', activity_stream=activity_stream, id=id, object_type=group_type %}
+
+{% snippet 'snippets/pagination.html', newer_activities_url=newer_activities_url, older_activities_url=older_activities_url %}
\ No newline at end of file
diff --git a/ckanext/activity/views.py b/ckanext/activity/views.py
index a973ed02e43..5088e80a5ed 100644
--- a/ckanext/activity/views.py
+++ b/ckanext/activity/views.py
@@ -577,7 +577,10 @@ def group_activity(id: str, group_type: str) -> str:
             _get_group_template("activity_template", group_type), extra_vars
         )
     else:
-        return tk.render(_get_group_template("activity_read_base_template", group_type), extra_vars)
+        return tk.render(
+            _get_group_template("activity_read_base_template", group_type),
+            extra_vars
+        )
 
 
 @bp.route(

From a18089fb5da3b3596be69c9cd748af02c7a3862b Mon Sep 17 00:00:00 2001
From: Alex Green <aleexgreen16@gmail.com>
Date: Fri, 14 Jun 2024 01:50:41 +0000
Subject: [PATCH 11/13] Streamline activity stream through snippets

---
 ckan/lib/plugins.py                           | 10 -----
 .../templates/group/activity_stream.html      | 11 +++---
 .../activity/templates/group/read_base.html   |  6 ---
 .../organization/activity_stream.html         | 10 ++---
 .../templates/organization/read_base.html     |  8 +---
 .../templates/package/activity_stream.html    | 21 +---------
 .../activity/templates/package/read_base.html |  2 +-
 .../templates/snippets/activity_stream.html   | 12 +++++-
 ckanext/activity/views.py                     | 38 +++++++++++++------
 9 files changed, 52 insertions(+), 66 deletions(-)

diff --git a/ckan/lib/plugins.py b/ckan/lib/plugins.py
index 427fd54e0ca..b55be1e5321 100644
--- a/ckan/lib/plugins.py
+++ b/ckan/lib/plugins.py
@@ -467,13 +467,6 @@ def edit_template(self) -> str:
         """
         return 'group/edit.html'
 
-    def activity_read_base_template(self) -> str:
-        """
-        Returns a string representing the location of the template to be
-        rendered for the activity stream page
-        """
-        return 'group/read_base.html'
-
     def activity_template(self) -> str:
         """
         Returns a string representing the location of the template to be
@@ -610,9 +603,6 @@ def edit_template(self) -> str:
     def activity_template(self) -> str:
         return 'organization/activity_stream.html'
 
-    def activity_template(self) -> str:
-        return 'organization/read_base.html'
-
 
 class DefaultTranslation(object):
     name: str
diff --git a/ckanext/activity/templates/group/activity_stream.html b/ckanext/activity/templates/group/activity_stream.html
index 42840040a10..66b10f0740f 100644
--- a/ckanext/activity/templates/group/activity_stream.html
+++ b/ckanext/activity/templates/group/activity_stream.html
@@ -1,8 +1,7 @@
-{% if activity_types is defined %}
-  {% snippet 'snippets/activity_type_selector.html', id=id, activity_type=activity_type, activity_types=activity_types, blueprint='activity.group_activity' %}
-{% endif %}
+{% extends "group/read_base.html" %}
 
-{% snippet 'snippets/stream.html', activity_stream=activity_stream, id=id, object_type='group' %}
-
-{% snippet 'snippets/pagination.html', newer_activities_url=newer_activities_url, older_activities_url=older_activities_url %}
+{% block subtitle %}{{ _('Activity Stream') }} {{ g.template_title_delimiter }} {{ super() }}{% endblock %}
 
+{% block primary_content_inner %}
+  {% snippet 'snippets/activity_stream.html', activity_stream=activity_stream, id=id, object_type='group', group_type=group_type, activity_types=activity_types, blueprint='activity.group_activity' %}
+{% endblock primary_content_inner %}
\ No newline at end of file
diff --git a/ckanext/activity/templates/group/read_base.html b/ckanext/activity/templates/group/read_base.html
index 8cfdee9d90c..03ce862195e 100644
--- a/ckanext/activity/templates/group/read_base.html
+++ b/ckanext/activity/templates/group/read_base.html
@@ -1,12 +1,6 @@
 {% ckan_extends %}
 
-{% block subtitle %}{{ _('Activity Stream') }} {{ g.template_title_delimiter }} {{ super() }}{% endblock subtitle %}
-
 {% block content_primary_nav %}
   {{ super() }}
   {{ h.build_nav_icon('activity.group_activity', _('Activity Stream'), id=group_dict.name, offset=0, icon='clock') }}
 {% endblock content_primary_nav %}
-
-{% block primary_content_inner %}
-  {% snippet 'group/activity_stream.html', activity_stream=activity_stream, id=id, object_type='group', group_type=group_type, activity_types=activity_types, blueprint='activity.group_activity' %}
-{% endblock primary_content_inner %}
diff --git a/ckanext/activity/templates/organization/activity_stream.html b/ckanext/activity/templates/organization/activity_stream.html
index 688fa727561..09330c4b1c4 100644
--- a/ckanext/activity/templates/organization/activity_stream.html
+++ b/ckanext/activity/templates/organization/activity_stream.html
@@ -1,7 +1,7 @@
-{% if activity_types is defined %}
-  {% snippet 'snippets/activity_type_selector.html', id=id, activity_type=activity_type, activity_types=activity_types, blueprint='activity.organization_activity' %}
-{% endif %}
+{% extends "organization/read_base.html" %}
 
-{% snippet 'snippets/stream.html', activity_stream=activity_stream, id=id, object_type='organization' %}
+{% block subtitle %}{{ _('Activity Stream') }} {{ g.template_title_delimiter }} {{ super() }}{% endblock %}
 
-{% snippet 'snippets/pagination.html', newer_activities_url=newer_activities_url, older_activities_url=older_activities_url %}
\ No newline at end of file
+{% block primary_content_inner %}
+  {% snippet 'snippets/activity_stream.html', activity_stream=activity_stream, id=id, object_type='organization', group_type=group_type, activity_types=activity_types, blueprint='activity.organization_activity' %}
+{% endblock primary_content_inner %}
\ No newline at end of file
diff --git a/ckanext/activity/templates/organization/read_base.html b/ckanext/activity/templates/organization/read_base.html
index 2d51a183724..7cd7f845466 100644
--- a/ckanext/activity/templates/organization/read_base.html
+++ b/ckanext/activity/templates/organization/read_base.html
@@ -1,12 +1,6 @@
 {% ckan_extends %}
 
-{% block subtitle %}{{ _('Activity Stream') }} {{ g.template_title_delimiter }}{% endblock subtitle%}
-
 {% block content_primary_nav %}
   {{ super() }}
   {{ h.build_nav_icon('activity.organization_activity', _('Activity Stream'), id=group_dict.name, offset=0, icon='clock') }}
-{% endblock content_primary_nav %}
-
-{% block primary_content_inner %}
-  {% snippet 'organization/activity_stream.html', activity_stream=activity_stream, id=id, object_type='organization', group_type=group_type, activity_types=activity_types, blueprint='activity.organization_activity' %}
-{% endblock primary_content_inner %}
\ No newline at end of file
+{% endblock content_primary_nav %}
\ No newline at end of file
diff --git a/ckanext/activity/templates/package/activity_stream.html b/ckanext/activity/templates/package/activity_stream.html
index 40e663e3442..570974f7296 100644
--- a/ckanext/activity/templates/package/activity_stream.html
+++ b/ckanext/activity/templates/package/activity_stream.html
@@ -3,22 +3,5 @@
 {% block subtitle %}{{ _('Activity Stream') }} {{ g.template_title_delimiter }} {{ super() }}{% endblock %}
 
 {% block primary_content_inner %}
-  {% if activity_types is defined %}
-    {% snippet 'snippets/activity_type_selector.html', id=id, activity_type=activity_type, activity_types=activity_types, blueprint='dataset.activity' %}
-  {% endif %}
-
-  {% if activity_stream|length > 0 %}
-    {% snippet 'snippets/stream.html', activity_stream=activity_stream, id=id, object_type='package' %}
-  {% else %}
-    <p>
-      {% if activity_type %}
-        {{ _('No activity found for this type') }}
-      {% else %}
-        {{ _('No activity found') }}.
-      {% endif %}
-    </p>
-  {% endif %}
-
-  {% snippet 'snippets/pagination.html', newer_activities_url=newer_activities_url, older_activities_url=older_activities_url %}
-
-{% endblock %}
+  {% snippet 'snippets/activity_stream.html', activity_stream=activity_stream, id=id, object_type='package', group_type=group_type, activity_types=activity_types, blueprint='activity.package_activity' %}
+{% endblock primary_content_inner %}
\ No newline at end of file
diff --git a/ckanext/activity/templates/package/read_base.html b/ckanext/activity/templates/package/read_base.html
index c0ec7143728..b7b590065af 100644
--- a/ckanext/activity/templates/package/read_base.html
+++ b/ckanext/activity/templates/package/read_base.html
@@ -3,4 +3,4 @@
 {% block content_primary_nav %}
   {{ super() }}
   {{ h.build_nav_icon('activity.package_activity', _('Activity Stream'), id=pkg.id if is_activity_archive else pkg.name, icon='clock') }}
-{% endblock content_primary_nav %}
+{% endblock content_primary_nav %}
\ No newline at end of file
diff --git a/ckanext/activity/templates/snippets/activity_stream.html b/ckanext/activity/templates/snippets/activity_stream.html
index 179fd7bb7eb..1c552406208 100644
--- a/ckanext/activity/templates/snippets/activity_stream.html
+++ b/ckanext/activity/templates/snippets/activity_stream.html
@@ -2,6 +2,16 @@
   {% snippet 'snippets/activity_type_selector.html', id=id, activity_type=activity_type, activity_types=activity_types, blueprint=blueprint %}
 {% endif %}
 
-{% snippet 'snippets/stream.html', activity_stream=activity_stream, id=id, object_type=group_type %}
+{% if activity_stream|length > 0 %}
+    {% snippet 'snippets/stream.html', activity_stream=activity_stream, id=id, object_type=object_type %}
+{% else %}
+    <p>
+      {% if activity_type %}
+        {{ _('No activity found for this type') }}
+      {% else %}
+        {{ _('No activity found') }}.
+      {% endif %}
+    </p>
+{% endif %}
 
 {% snippet 'snippets/pagination.html', newer_activities_url=newer_activities_url, older_activities_url=older_activities_url %}
\ No newline at end of file
diff --git a/ckanext/activity/views.py b/ckanext/activity/views.py
index 5088e80a5ed..bf41c06cfb6 100644
--- a/ckanext/activity/views.py
+++ b/ckanext/activity/views.py
@@ -17,6 +17,8 @@
     _replace_group_org,
 )
 
+from ckan.common import request as ckan_request
+
 # TODO: don't use hidden funcitons
 from ckan.views.user import _extra_template_variables
 
@@ -348,10 +350,11 @@ def package_activity(id: str) -> Union[Response, str]:  # noqa
         activity_type=activity_type
     )
 
-    return tk.render(
-        "package/activity_stream.html",
-        {
-            "dataset_type": dataset_type,
+    object_type = "package"
+    blueprint = "activity.{}_activity".format(object_type)
+
+    extra_vars = {
+        "dataset_type": dataset_type,
             "pkg_dict": pkg_dict,
             "activity_stream": activity_stream,
             "id": id,  # i.e. package's current name
@@ -361,8 +364,18 @@ def package_activity(id: str) -> Union[Response, str]:  # noqa
             "activity_types": VALIDATORS_PACKAGE_ACTIVITY_TYPES.keys(),
             "newer_activities_url": newer_activities_url,
             "older_activities_url": older_activities_url,
-        },
-    )
+            "blueprint": blueprint,
+            "object_type": object_type,
+    }
+
+    if ckan_request.htmx:
+        return tk.render(
+            "snippets/activity_stream.html", extra_vars
+        )
+    else:
+        return tk.render(
+            "package/activity_stream.html", extra_vars
+        )
 
 
 @bp.route("/dataset/changes/<id>")
@@ -561,6 +574,8 @@ def group_activity(id: str, group_type: str) -> str:
         activity_type=activity_type
     )
 
+    blueprint = "activity.{}_activity".format(group_type)
+
     extra_vars = {
         "id": id,
         "activity_stream": activity_stream,
@@ -569,17 +584,18 @@ def group_activity(id: str, group_type: str) -> str:
         "activity_type": activity_type,
         "activity_types": filter_types.keys(),
         "newer_activities_url": newer_activities_url,
-        "older_activities_url": older_activities_url
+        "older_activities_url": older_activities_url,
+        "blueprint": blueprint,
+        "object_type": group_type,
     }
 
-    if tk.request.htmx:
+    if ckan_request.htmx:
         return tk.render(
-            _get_group_template("activity_template", group_type), extra_vars
+            "snippets/activity_stream.html", extra_vars
         )
     else:
         return tk.render(
-            _get_group_template("activity_read_base_template", group_type),
-            extra_vars
+            _get_group_template("activity_template", group_type), extra_vars
         )
 
 

From fa80307f11b98c50940c5eed66cd557c2642d245 Mon Sep 17 00:00:00 2001
From: Alex Green <aleexgreen16@gmail.com>
Date: Fri, 14 Jun 2024 01:52:42 +0000
Subject: [PATCH 12/13] Fix lint errors

---
 ckanext/activity/views.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/ckanext/activity/views.py b/ckanext/activity/views.py
index bf41c06cfb6..7f0adbfdd05 100644
--- a/ckanext/activity/views.py
+++ b/ckanext/activity/views.py
@@ -355,17 +355,17 @@ def package_activity(id: str) -> Union[Response, str]:  # noqa
 
     extra_vars = {
         "dataset_type": dataset_type,
-            "pkg_dict": pkg_dict,
-            "activity_stream": activity_stream,
-            "id": id,  # i.e. package's current name
-            "limit": limit,
-            "has_more": has_more,
-            "activity_type": activity_type,
-            "activity_types": VALIDATORS_PACKAGE_ACTIVITY_TYPES.keys(),
-            "newer_activities_url": newer_activities_url,
-            "older_activities_url": older_activities_url,
-            "blueprint": blueprint,
-            "object_type": object_type,
+        "pkg_dict": pkg_dict,
+        "activity_stream": activity_stream,
+        "id": id,  # i.e. package's current name
+        "limit": limit,
+        "has_more": has_more,
+        "activity_type": activity_type,
+        "activity_types": VALIDATORS_PACKAGE_ACTIVITY_TYPES.keys(),
+        "newer_activities_url": newer_activities_url,
+        "older_activities_url": older_activities_url,
+        "blueprint": blueprint,
+        "object_type": object_type,
     }
 
     if ckan_request.htmx:

From b7dd13e54a3a9d10802cc2963fbbca3fb315d240 Mon Sep 17 00:00:00 2001
From: Alex Green <aleexgreen16@gmail.com>
Date: Wed, 19 Jun 2024 02:14:34 +0000
Subject: [PATCH 13/13] Add hx-target to pagination buttons

---
 ckan/common.py                                         |  4 ++--
 ckan/lib/captcha.py                                    |  5 ++---
 ckan/views/admin.py                                    |  2 +-
 ckanext/activity/templates/group/activity_stream.html  | 10 +++++++++-
 .../templates/organization/activity_stream.html        | 10 +++++++++-
 .../activity/templates/package/activity_stream.html    | 10 +++++++++-
 ckanext/activity/templates/snippets/pagination.html    |  2 +-
 7 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/ckan/common.py b/ckan/common.py
index 32aaf51f2d7..0f04eccadb1 100644
--- a/ckan/common.py
+++ b/ckan/common.py
@@ -212,7 +212,7 @@ def params(self):
         request.args
 
         '''
-        return cast(flask.Request, self).args
+        return self.args
 
 
 def _get_c():
@@ -327,7 +327,7 @@ def repr_untrusted(danger: Any):
 config_declaration = local.config_declaration = Declaration()
 
 # Proxies to already thread-local safe objects
-request = cast(flask.Request, CKANRequest(_get_request))
+request = CKANRequest(_get_request)
 # Provide a `c`  alias for `g` for backwards compatibility
 g: Any = LocalProxy(_get_c)
 c = g
diff --git a/ckan/lib/captcha.py b/ckan/lib/captcha.py
index d4f0227c9dc..eecc852d531 100644
--- a/ckan/lib/captcha.py
+++ b/ckan/lib/captcha.py
@@ -2,11 +2,10 @@
 
 import requests
 
-from ckan.common import config
-from ckan.types import Request
+from ckan.common import config, CKANRequest
 
 
-def check_recaptcha(request: Request) -> None:
+def check_recaptcha(request: CKANRequest) -> None:
     '''Check a user's recaptcha submission is valid, and raise CaptchaError
     on failure.'''
     recaptcha_private_key = config.get('ckan.recaptcha.privatekey')
diff --git a/ckan/views/admin.py b/ckan/views/admin.py
index 3a6a963223d..248a41a6824 100644
--- a/ckan/views/admin.py
+++ b/ckan/views/admin.py
@@ -86,7 +86,7 @@ def get(self) -> str:
 
     def post(self) -> Union[str, Response]:
         try:
-            req: dict[str, Any] = request.form.copy()
+            req = request.form.copy()
             req.update(request.files.to_dict())
             data_dict = logic.clean_dict(
                 dict_fns.unflatten(
diff --git a/ckanext/activity/templates/group/activity_stream.html b/ckanext/activity/templates/group/activity_stream.html
index 66b10f0740f..f6e4dc08ed1 100644
--- a/ckanext/activity/templates/group/activity_stream.html
+++ b/ckanext/activity/templates/group/activity_stream.html
@@ -3,5 +3,13 @@
 {% block subtitle %}{{ _('Activity Stream') }} {{ g.template_title_delimiter }} {{ super() }}{% endblock %}
 
 {% block primary_content_inner %}
-  {% snippet 'snippets/activity_stream.html', activity_stream=activity_stream, id=id, object_type='group', group_type=group_type, activity_types=activity_types, blueprint='activity.group_activity' %}
+  {% snippet 'snippets/activity_stream.html',
+     activity_stream=activity_stream,
+     id=id,
+     object_type='group',
+     group_type=group_type,
+     activity_types=activity_types,
+     blueprint='activity.group_activity',
+     newer_activities_url=newer_activities_url,
+     older_activities_url=older_activities_url %}
 {% endblock primary_content_inner %}
\ No newline at end of file
diff --git a/ckanext/activity/templates/organization/activity_stream.html b/ckanext/activity/templates/organization/activity_stream.html
index 09330c4b1c4..a2685b37ef8 100644
--- a/ckanext/activity/templates/organization/activity_stream.html
+++ b/ckanext/activity/templates/organization/activity_stream.html
@@ -3,5 +3,13 @@
 {% block subtitle %}{{ _('Activity Stream') }} {{ g.template_title_delimiter }} {{ super() }}{% endblock %}
 
 {% block primary_content_inner %}
-  {% snippet 'snippets/activity_stream.html', activity_stream=activity_stream, id=id, object_type='organization', group_type=group_type, activity_types=activity_types, blueprint='activity.organization_activity' %}
+  {% snippet 'snippets/activity_stream.html',
+     activity_stream=activity_stream,
+     id=id,
+     object_type='organization',
+     group_type=group_type,
+     activity_types=activity_types,
+     blueprint='activity.organization_activity',
+     newer_activities_url=newer_activities_url,
+     older_activities_url=older_activities_url %}
 {% endblock primary_content_inner %}
\ No newline at end of file
diff --git a/ckanext/activity/templates/package/activity_stream.html b/ckanext/activity/templates/package/activity_stream.html
index 570974f7296..115208fc2e4 100644
--- a/ckanext/activity/templates/package/activity_stream.html
+++ b/ckanext/activity/templates/package/activity_stream.html
@@ -3,5 +3,13 @@
 {% block subtitle %}{{ _('Activity Stream') }} {{ g.template_title_delimiter }} {{ super() }}{% endblock %}
 
 {% block primary_content_inner %}
-  {% snippet 'snippets/activity_stream.html', activity_stream=activity_stream, id=id, object_type='package', group_type=group_type, activity_types=activity_types, blueprint='activity.package_activity' %}
+  {% snippet 'snippets/activity_stream.html',
+     activity_stream=activity_stream,
+     id=id,
+     object_type='package',
+     group_type=group_type,
+     activity_types=activity_types,
+     blueprint='activity.package_activity',
+     newer_activities_url=newer_activities_url,
+     older_activities_url=older_activities_url %}
 {% endblock primary_content_inner %}
\ No newline at end of file
diff --git a/ckanext/activity/templates/snippets/pagination.html b/ckanext/activity/templates/snippets/pagination.html
index 4b54cc6aa6c..855fbfab66a 100644
--- a/ckanext/activity/templates/snippets/pagination.html
+++ b/ckanext/activity/templates/snippets/pagination.html
@@ -2,7 +2,7 @@
 {% set class_next = "btn btn-default" if older_activities_url else "btn disabled" %}
 
 {% if newer_activities_url or older_activities_url %}
-    <div hx-boost="true" id="activity_page_buttons" class="activity_buttons" style="margin-top: 25px;">
+    <div hx-boost="true" hx-target="closest .module-content" id="activity_page_buttons" class="activity_buttons" style="margin-top: 25px;">
         <a href="{{ newer_activities_url }}" class="{{ class_prev }}">
             {{ _('Newer activities') }}
         </a>