From 220a4e245199f3a56fc16c6431591dd6bd68ee12 Mon Sep 17 00:00:00 2001
From: Mark Veidemanis <m@zm.is>
Date: Tue, 9 Aug 2022 11:54:44 +0100
Subject: [PATCH] Properly format templates

---
 app/urls.py                                   |   3 +-
 core/lib/opensearch.py                        |  12 +-
 core/templates/ui/drilldown/drilldown.html    |   3 +-
 core/templates/ui/drilldown/results.html      |  66 ++++++-----
 .../templates/ui/drilldown/table_results.html |  22 ++--
 .../ui/drilldown/table_results_partial.html   | 106 +++++++++---------
 core/templatetags/hy.py                       |   8 ++
 core/views/ui/drilldown.py                    |   3 +-
 core/views/ui/tables.py                       |   3 +-
 9 files changed, 122 insertions(+), 104 deletions(-)
 create mode 100644 core/templatetags/hy.py

diff --git a/app/urls.py b/app/urls.py
index a7e0e26..84d43ad 100644
--- a/app/urls.py
+++ b/app/urls.py
@@ -51,10 +51,9 @@ from core.views.manage.threshold.threshold import (
 )
 
 # Main tool pages
-from core.views.ui.drilldown import (
+from core.views.ui.drilldown import (  # DrilldownTableView,
     Drilldown,
     DrilldownSearch,
-    DrilldownTableView,
     ThresholdInfoModal,
 )
 from core.views.ui.insights import (
diff --git a/core/lib/opensearch.py b/core/lib/opensearch.py
index c829701..926ebbe 100644
--- a/core/lib/opensearch.py
+++ b/core/lib/opensearch.py
@@ -136,7 +136,7 @@ def run_main_query(client, user, query, custom_query=False, index=None, size=Non
         response = client.search(body=search_query, index=index)
     except RequestError as err:
         print("OpenSearch error", err)
-        return False
+        return err
     filter_blacklisted(user, response)
     return response
 
@@ -268,6 +268,15 @@ def query_results(request, size=None):
         )
         if not results:
             return False
+        if isinstance(results, RequestError):
+            message = results.info["error"]["root_cause"][0]["reason"]
+            message_class = "danger"
+            return {"message": message, "class": message_class}
+        if len(results["hits"]["hits"]) == 0:
+            message = "No results."
+            message_class = "danger"
+            return {"message": message, "class": message_class}
+
         results_parsed = []
         if "hits" in results.keys():
             if "hits" in results["hits"]:
@@ -289,7 +298,6 @@ def query_results(request, size=None):
                         element["date"] = date
                         element["time"] = time
                     results_parsed.append(element)
-
         annotate_results(results_parsed)
 
         context = {
diff --git a/core/templates/ui/drilldown/drilldown.html b/core/templates/ui/drilldown/drilldown.html
index 81cb937..de3a889 100644
--- a/core/templates/ui/drilldown/drilldown.html
+++ b/core/templates/ui/drilldown/drilldown.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% load static %}
+{% load hy %}
 {% block content %}
   <script src="{% static 'js/chart.js' %}"></script>
   <script>
@@ -104,7 +105,7 @@
         <div class="column is-3">
           <div class="nowrap-parent">
             <div
-              _="on click toggle .is-hidden on #options"
+              {{ hy }} = "on click toggle .is-hidden on #options"
               class="button is-light has-text-link is-right nowrap-child">
               Options
             </div>
diff --git a/core/templates/ui/drilldown/results.html b/core/templates/ui/drilldown/results.html
index 3c4c103..a83f858 100644
--- a/core/templates/ui/drilldown/results.html
+++ b/core/templates/ui/drilldown/results.html
@@ -4,25 +4,24 @@
 {% if results %}
   <div style="display: none" id="jsonData" data-json="{{ data }}">
   </div>
-
   <div class="has-text-grey-light nowrap-parent">
-      <div class="nowrap-child block">
-        <i class="fa-solid fa-chart-mixed"></i>
-      </div>
-      <div class="nowrap-child">
-        <p>fetched {{ results|length }} of {{ card }} hits in {{ took }}ms</p>
-      </div>
-      {% if exemption is not None %}
+    <div class="nowrap-child block">
+      <i class="fa-solid fa-chart-mixed"></i>
+    </div>
+    <div class="nowrap-child">
+      <p>fetched {{ results|length }} of {{ card }} hits in {{ took }}ms</p>
+    </div>
+    {% if exemption is not None %}
       <div class="nowrap-child">
         <i class="fa-solid fa-book-bible"></i>
       </div>
-      {% else %}
-        {% if redacted != 0 %}
+    {% else %}
+      {% if redacted != 0 %}
         <div class="nowrap-child">
-            <p>{{ redacted }} redacted</p>
+          <p>{{ redacted }} redacted</p>
         </div>
-        {% endif %}
       {% endif %}
+    {% endif %}
   </div>
   <div class="box">
     <div style="height: 30rem">
@@ -48,24 +47,23 @@
         </thead>
         <tbody>
           {% for item in results %}
-            {% if item.exemption == True %}
-              <tr class="has-background-grey-lighter">
-            {% elif item.type == 'join' %}
-              <tr class="has-background-success-light">
-            {% elif item.type == 'quit' %}
-              <tr class="has-background-danger-light">
-            {% elif item.type == 'kick' %}
-              <tr class="has-background-danger-light">
-            {% elif item.type == 'part' %}
-              <tr class="has-background-warning-light">
-            {% elif item.type == 'mode' %}
-              <tr class="has-background-info-light">
-            {% else %}
-              <tr>
-            {% endif %}
+            {# Workaround for curlylint #}
+            <tr class="{% if item.exemption == True %}
+                         has-background-grey-lighter
+                       {% elif item.type == 'join' %}
+                         has-background-success-light
+                       {% elif item.type == 'quit' %}
+                         has-background-danger-light
+                       {% elif item.type == 'kick' %}
+                         has-background-danger-light
+                       {% elif item.type == 'part' %}
+                         has-background-warning-light
+                       {% elif item.type == 'mode' %}
+                         has-background-info-light
+                       {% endif %}">
               <td>
                 <a class="has-text-link is-underlined"
-                  onclick="toggleTag('src', '{{ item.src|escapejs }}')">
+                   onclick="toggleTag('src', '{{ item.src|escapejs }}')">
                   {% if item.src == 'irc' %}
                     <span class="icon" data-tooltip="IRC">
                       <i class="fa-solid fa-hashtag" aria-hidden="true"></i>
@@ -79,7 +77,7 @@
               </td>
               <td>
                 <a class="has-text-link is-underlined"
-                  onclick="toggleTag('type', '{{ item.type|escapejs }}')">
+                   onclick="toggleTag('type', '{{ item.type|escapejs }}')">
                   {% if item.type == 'msg' %}
                     <span class="icon" data-tooltip="Message">
                       <i class="fa-solid fa-message"></i>
@@ -124,7 +122,7 @@
               <td style="max-width: 10em" class="wrap">{{ item.msg }}</td>
               <td>
                 <a class="has-text-link is-underlined"
-                  onclick="toggleTag('host', '{{ item.host|escapejs }}')">
+                   onclick="toggleTag('host', '{{ item.host|escapejs }}')">
                   {{ item.host }}
                 </a>
               </td>
@@ -148,13 +146,13 @@
                   <a class="nowrap-child has-text-link is-underlined" onclick="toggleTag('nick', '{{ item.nick|escapejs }}')">
                     {{ item.nick }}
                   </a>
-                    {% if item.num_chans is not None %}
+                  {% if item.num_chans is not None %}
                     <div class="nowrap-child">
                       <span class="tag">
                         {{ item.num_chans }}
                       </span>
                     </div>
-                    {% endif %}
+                  {% endif %}
                 </div>
               </td>
               <td>
@@ -173,7 +171,7 @@
               <td>
                 <div class="nowrap-parent">
                   <a class="nowrap-child has-text-link is-underlined"
-                    onclick="toggleTag('channel', '{{ item.channel|escapejs }}')">
+                     onclick="toggleTag('channel', '{{ item.channel|escapejs }}')">
                     {{ item.channel }}
                   </a>
                   {% if item.num_users is not None %}
@@ -187,7 +185,7 @@
               </td>
               <td>
                 <a class="has-text-link is-underlined"
-                  onclick="toggleTag('net', '{{ item.net|escapejs }}')">
+                   onclick="toggleTag('net', '{{ item.net|escapejs }}')">
                   {{ item.net }}
                 </a>
               </td>
diff --git a/core/templates/ui/drilldown/table_results.html b/core/templates/ui/drilldown/table_results.html
index 849a7bf..d842efa 100644
--- a/core/templates/ui/drilldown/table_results.html
+++ b/core/templates/ui/drilldown/table_results.html
@@ -6,23 +6,23 @@
   </div>
 
   <div class="has-text-grey-light nowrap-parent">
-      <div class="nowrap-child block">
-        <i class="fa-solid fa-chart-mixed"></i>
-      </div>
-      <div class="nowrap-child">
-        <p>fetched {{ results|length }} of {{ card }} hits in {{ took }}ms</p>
-      </div>
-      {% if exemption is not None %}
+    <div class="nowrap-child block">
+      <i class="fa-solid fa-chart-mixed"></i>
+    </div>
+    <div class="nowrap-child">
+      <p>fetched {{ results|length }} of {{ card }} hits in {{ took }}ms</p>
+    </div>
+    {% if exemption is not None %}
       <div class="nowrap-child">
         <i class="fa-solid fa-book-bible"></i>
       </div>
-      {% else %}
-        {% if redacted != 0 %}
+    {% else %}
+      {% if redacted != 0 %}
         <div class="nowrap-child">
-            <p>{{ redacted }} redacted</p>
+          <p>{{ redacted }} redacted</p>
         </div>
-        {% endif %}
       {% endif %}
+    {% endif %}
   </div>
   <div class="box">
     <div class="table-container">
diff --git a/core/templates/ui/drilldown/table_results_partial.html b/core/templates/ui/drilldown/table_results_partial.html
index c91481e..401abf7 100644
--- a/core/templates/ui/drilldown/table_results_partial.html
+++ b/core/templates/ui/drilldown/table_results_partial.html
@@ -6,66 +6,70 @@
 
 {% block table.thead %}
   {% if table.show_header %}
-      <thead {{ table.attrs.thead.as_html }}>
+    <thead {{ table.attrs.thead.as_html }}>
       <tr>
-          {% for column in table.columns %}
-              <th {{ column.attrs.th.as_html }}
-                  hx-post="{% querystring table.prefixed_order_by_field=column.order_by_alias.next %}"
-                  hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
-                  hx-trigger="click"
-                  hx-target="div.table-container"
-                  hx-swap="outerHTML"
-                  hx-indicator=".progress"
-                  style="cursor: pointer;">
-                  {{ column.header }}
-              </th>
-          {% endfor %}
+        {% for column in table.columns %}
+          <th
+            {{ column.attrs.th.as_html }}
+            hx-post="{% querystring table.prefixed_order_by_field=column.order_by_alias.next %}"
+            hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
+            hx-trigger="click"
+            hx-target="div.table-container"
+            hx-swap="outerHTML"
+            hx-indicator=".progress"
+            style="cursor: pointer;">
+            {{ column.header }}
+          </th>
+        {% endfor %}
       </tr>
-      </thead>
+    </thead>
   {% endif %}
 {% endblock table.thead %}
 
 {# Pagination block overrides #}
 {% block pagination.previous %}
-    <li class="previous page-item">
-        <div hx-post="{% querystring table.prefixed_page_field=table.page.previous_page_number %}"
-             hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
-             hx-trigger="click"
-             hx-target="div.table-container"
-             hx-swap="outerHTML"
-             hx-indicator=".progress"
-             class="page-link">
-            <span aria-hidden="true">&laquo;</span>
-            {% trans 'previous' %}
-        </div>
-    </li>
+  <li class="previous page-item">
+    <div
+      hx-post="{% querystring table.prefixed_page_field=table.page.previous_page_number %}"
+      hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
+      hx-trigger="click"
+      hx-target="div.table-container"
+      hx-swap="outerHTML"
+      hx-indicator=".progress"
+      class="page-link">
+      <span aria-hidden="true">&laquo;</span>
+      {% trans 'previous' %}
+    </div>
+  </li>
 {% endblock pagination.previous %}
 {% block pagination.range %}
-    {% for p in table.page|table_page_range:table.paginator %}
-        <li class="page-item{% if table.page.number == p %} active{% endif %}">
-            <div class="page-link" 
-                 {% if p != '...' %}hx-post="{% querystring table.prefixed_page_field=p %}"{% endif %}
-                 hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
-                 hx-trigger="click"
-                 hx-target="div.table-container"
-                 hx-swap="outerHTML"
-                 hx-indicator=".progress">
-                {{ p }}
-            </div>
-        </li>
-    {% endfor %}
+  {% for p in table.page|table_page_range:table.paginator %}
+    <li class="page-item{% if table.page.number == p %} active{% endif %}">
+      <div
+        class="page-link" 
+        {% if p != '...' %}hx-post="{% querystring table.prefixed_page_field=p %}"{% endif %}
+        hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
+        hx-trigger="click"
+        hx-target="div.table-container"
+        hx-swap="outerHTML"
+        hx-indicator=".progress">
+        {{ p }}
+      </div>
+    </li>
+  {% endfor %}
 {% endblock pagination.range %}
 {% block pagination.next %}
-    <li class="next page-item">
-        <div hx-post="{% querystring table.prefixed_page_field=table.page.next_page_number %}"
-             hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
-             hx-trigger="click"
-             hx-target="div.table-container"
-             hx-swap="outerHTML"
-             hx-indicator=".progress"
-             class="page-link">
-            {% trans 'next' %}
-            <span aria-hidden="true">&raquo;</span>
-        </div>
-    </li>
+  <li class="next page-item">
+    <div
+      hx-post="{% querystring table.prefixed_page_field=table.page.next_page_number %}"
+      hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
+      hx-trigger="click"
+      hx-target="div.table-container"
+      hx-swap="outerHTML"
+      hx-indicator=".progress"
+      class="page-link">
+      {% trans 'next' %}
+      <span aria-hidden="true">&raquo;</span>
+    </div>
+  </li>
 {% endblock pagination.next %}
\ No newline at end of file
diff --git a/core/templatetags/hy.py b/core/templatetags/hy.py
new file mode 100644
index 0000000..29c300f
--- /dev/null
+++ b/core/templatetags/hy.py
@@ -0,0 +1,8 @@
+from django import template
+
+register = template.Library()
+
+# Dirty hack to workaround curlylint not allowing _
+@register.filter
+def hy(user, plan_name):
+    return "_"
diff --git a/core/views/ui/drilldown.py b/core/views/ui/drilldown.py
index a24ae06..bf72b1b 100644
--- a/core/views/ui/drilldown.py
+++ b/core/views/ui/drilldown.py
@@ -3,7 +3,6 @@ import json
 from django.conf import settings
 from django.http import HttpResponse, JsonResponse
 from django.shortcuts import render
-from django.utils.html import format_html
 from django.views import View
 from django_tables2 import SingleTableMixin
 from rest_framework.parsers import FormParser
@@ -40,7 +39,7 @@ class DrilldownTableView(View, SingleTableMixin):
             template_name = "ui/drilldown/table_results_partial.html"
 
         if context:
-            return render(request, self.template_name, context)
+            return render(request, template_name, context)
         else:
             return HttpResponse("No results")
 
diff --git a/core/views/ui/tables.py b/core/views/ui/tables.py
index 097704b..e03df85 100644
--- a/core/views/ui/tables.py
+++ b/core/views/ui/tables.py
@@ -1,4 +1,5 @@
-from django_tables2 import Table, Column
+from django_tables2 import Column, Table
+
 
 class DrilldownTable(Table):
     id = Column()