Make it more standard-compliant

- htmx does not allow disinheriting `hx-vals` attribute... :( (bigskysoftware/htmx#1119)
aio-libs · Aug 21, 2023 · a0f563d · a0f563d
1 parent e0b02c5
commit a0f563d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/aiomonitor/webui/templates/index.html b/aiomonitor/webui/templates/index.html
@@ -117,7 +117,8 @@
       type="button"
       class="notify-result rounded bg-rose-600 px-2 py-1 text-xs font-semibold text-white shadow-sm hover:bg-rose-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-rose-600 disabled:opacity-50"
       hx-delete="/api/task"
-      hx-vals='{"task_id": "{{ task_id }}"'
+      hx-disinherit="*"
+      hx-vals='{"task_id": "{{ task_id }}"}'
       hx-swap="none"
       hx-sync="closest tbody:drop"
       onclick="this.disabled=true"
@@ -127,6 +128,7 @@
       type="button"
       class="rounded bg-indigo-600 px-2 py-1 text-xs font-semibold text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600"
       hx-get="/api/task?task_id={{ task_id }}"
+      hx-disinherit="*"
       hx-swap="none"
       hx-sync="closest tbody:drop"
     >Trace</button>
@@ -226,6 +228,7 @@
       type="button"
       class="rounded bg-indigo-600 px-2 py-1 text-xs font-semibold text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600"
       hx-get="/api/terminated-task?task_id={{ task_id }}"
+      hx-disinherit="*"
       hx-swap="none"
       hx-sync="closest tbody:drop"
     >Trace</button>

diff --git a/aiomonitor/webui/templates/layout.html b/aiomonitor/webui/templates/layout.html
@@ -3,6 +3,7 @@
 <head>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width">
+  <meta name="htmx-config" content='{"methodsThatUseUrlParams":["get","delete"]}'>
   <title>aiomonitor - {{ title }}</title>
   <script src="/static/htmx.js"></script>
   <script src="/static/mustache.js"></script>

diff --git a/aiomonitor/webui/utils.py b/aiomonitor/webui/utils.py
@@ -12,7 +12,7 @@ async def check_params(
     checker: t.Trafaret,
 ) -> AsyncIterator[Any]:
     try:
-        if request.method == "GET":
+        if request.method in ("GET", "DELETE"):
             params = checker.check(request.query)
         else:
             body = await request.post()