From 3af047be3fdcf6cab5f609cda3bbec6eab3b16d2 Mon Sep 17 00:00:00 2001
From: Ilona Podliashanyk <ilona.podliashanyk@sikt.no>
Date: Fri, 19 Jan 2024 15:33:49 +0100
Subject: [PATCH] Declare generic hx-target-error globally

---
 src/howitz/error_handlers.py                            | 2 --
 src/howitz/templates/components/row/collapse-btn.html   | 1 -
 src/howitz/templates/components/row/event-row.html      | 1 -
 src/howitz/templates/components/row/expand-btn.html     | 1 -
 src/howitz/templates/components/row/expanded-row.html   | 1 -
 src/howitz/templates/components/table/events-table.html | 1 -
 src/howitz/templates/layouts/base.html                  | 3 ++-
 src/howitz/templates/views/events.html                  | 3 +--
 src/howitz/templates/views/login.html                   | 2 +-
 9 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/howitz/error_handlers.py b/src/howitz/error_handlers.py
index 5f5d0150..b06d421a 100644
--- a/src/howitz/error_handlers.py
+++ b/src/howitz/error_handlers.py
@@ -20,7 +20,6 @@ def handle_generic_http_exception(e):
                            alert_id=alert_random_id, short_err_msg=short_err_msg))
 
     response.headers['HX-Reswap'] = 'beforeend'
-    response.headers['HX-Retarget'] = 'body'
 
     return response, e.code
 
@@ -48,6 +47,5 @@ def handle_generic_exception(e):
                            alert_id=alert_random_id, short_err_msg=short_err_msg))
 
     response.headers['HX-Reswap'] = 'beforeend'
-    response.headers['HX-Retarget'] = 'body'
 
     return response, 500
diff --git a/src/howitz/templates/components/row/collapse-btn.html b/src/howitz/templates/components/row/collapse-btn.html
index 02b81917..78228f23 100644
--- a/src/howitz/templates/components/row/collapse-btn.html
+++ b/src/howitz/templates/components/row/collapse-btn.html
@@ -4,7 +4,6 @@
         hx-get="/events/{{ id }}/collapse_row"
         hx-trigger="click"
         hx-swap="multi:#event-accordion-row-{{ id }}:outerHTML,#event-details-row-{{ id }}:delete"
-        hx-target-error="body"
         hx-indicator="#row-{{ id }}-indicator"
 >
 
diff --git a/src/howitz/templates/components/row/event-row.html b/src/howitz/templates/components/row/event-row.html
index 84deaa09..cc169980 100644
--- a/src/howitz/templates/components/row/event-row.html
+++ b/src/howitz/templates/components/row/event-row.html
@@ -4,7 +4,6 @@
         hx-get="/events/{{ id }}/expand_row"
         hx-trigger="dblclick"
         hx-target="#event-accordion-row-{{ id }}"
-        hx-target-error="body"
         hx-swap="outerHTML"
 >
     {% with padding='px-3 py-2' %}
diff --git a/src/howitz/templates/components/row/expand-btn.html b/src/howitz/templates/components/row/expand-btn.html
index 48a508e0..be7d66f8 100644
--- a/src/howitz/templates/components/row/expand-btn.html
+++ b/src/howitz/templates/components/row/expand-btn.html
@@ -4,7 +4,6 @@
         hx-get="/events/{{ id }}/expand_row"
         hx-trigger="click"
         hx-target="#event-accordion-row-{{ id }}"
-        hx-target-error="body"
         hx-swap="outerHTML"
         hx-indicator="#row-{{ id }}-indicator"
 >
diff --git a/src/howitz/templates/components/row/expanded-row.html b/src/howitz/templates/components/row/expanded-row.html
index 5b35e9b2..e3925dbb 100644
--- a/src/howitz/templates/components/row/expanded-row.html
+++ b/src/howitz/templates/components/row/expanded-row.html
@@ -6,7 +6,6 @@
             hx-get="/events/{{ id }}/collapse_row"
             hx-trigger="dblclick"
             hx-swap="multi:#event-accordion-row-{{ id }}:outerHTML,#event-details-row-{{ id }}:delete"
-            hx-target-error="body"
     >
 
         {% with padding='px-3 py-2' %}
diff --git a/src/howitz/templates/components/table/events-table.html b/src/howitz/templates/components/table/events-table.html
index ce2ee535..2ff9761f 100644
--- a/src/howitz/templates/components/table/events-table.html
+++ b/src/howitz/templates/components/table/events-table.html
@@ -4,7 +4,6 @@
         hx-swap="innerHTML"
         hx-target="#eventlist-list"
         hx-trigger="load"
-        hx-target-error="body"
 >
     <thead class="text-xs text-center text-gray-700 uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-300">
     <tr>
diff --git a/src/howitz/templates/layouts/base.html b/src/howitz/templates/layouts/base.html
index 871c8075..0653e798 100644
--- a/src/howitz/templates/layouts/base.html
+++ b/src/howitz/templates/layouts/base.html
@@ -24,8 +24,9 @@
 
 </head>
 <body
-        hx-ext="[{% block extensions %}{% endblock %}]"
+        hx-ext="{% block extensions %}{% endblock %}"
         class="h-full"
+        hx-target-error="body"
 >
 {% block content %} {% endblock content %}
 
diff --git a/src/howitz/templates/views/events.html b/src/howitz/templates/views/events.html
index 504a264d..2655a19b 100644
--- a/src/howitz/templates/views/events.html
+++ b/src/howitz/templates/views/events.html
@@ -2,7 +2,7 @@
 
 {% block page_title %} Events {% endblock %}
 
-{% block extensions %} class-tools, multi-swap, disable-element, loading-states, response-targets {% endblock %}
+{% block extensions %}class-tools, multi-swap, disable-element, loading-states, response-targets{% endblock %}
 
 
 {% block content %}
@@ -18,7 +18,6 @@ <h1 class="sr-only">Events table</h1>
                 hx-trigger="load"
                 role="status"
                 class="htmx-indicator animate-pulse"
-                hx-target-error="body"
         >
 
             <span class="sr-only">Loading Table...</span>
diff --git a/src/howitz/templates/views/login.html b/src/howitz/templates/views/login.html
index efe89f41..5d7efa2c 100644
--- a/src/howitz/templates/views/login.html
+++ b/src/howitz/templates/views/login.html
@@ -2,7 +2,7 @@
 
 {% block page_title %} Login {% endblock %}
 
-{% block extensions %} class-tools, multi-swap, disable-element, loading-states, response-targets {% endblock %}
+{% block extensions %}class-tools, multi-swap, disable-element, loading-states, response-targets{% endblock %}
 
 {% block content %}