From 86ec95ab6ca601e9ce1275eb193313c6c0c6f190 Mon Sep 17 00:00:00 2001
From: Mark Veidemanis <m@zm.is>
Date: Thu, 11 Aug 2022 07:22:22 +0100
Subject: [PATCH] Fix tag population and date formatting

---
 .../templates/ui/drilldown/table_results.html |  23 +-
 .../ui/drilldown/table_results_partial.html   | 334 +++++++++---------
 core/views/ui/drilldown.py                    |   1 +
 core/views/ui/tables.py                       |  10 +-
 4 files changed, 189 insertions(+), 179 deletions(-)

diff --git a/core/templates/ui/drilldown/table_results.html b/core/templates/ui/drilldown/table_results.html
index c691678..05d31d8 100644
--- a/core/templates/ui/drilldown/table_results.html
+++ b/core/templates/ui/drilldown/table_results.html
@@ -1,5 +1,6 @@
 {% load static %}
 {% load index %}
+{% load joinsep %}
 {% include 'partials/notify.html' %}
 {% if table %}
   <div style="display: none" id="jsonData" data-json="{{ data }}">
@@ -35,4 +36,24 @@
       {% include 'ui/drilldown/table_results_partial.html' %}
     </div>
   </div>
-{% endif %}
\ No newline at end of file
+{% endif %}
+{# Update the tags in case the user changed the query #}
+{# Check for focus and refocus #}
+<script>
+  var inputTags = document.getElementsByClassName('tags-input');
+  var inputBox = document.querySelector("[placeholder='Add query']");
+  var isFocused = (document.activeElement === inputBox);
+  for (index = 0; index < inputTags.length; index++) {
+    if (index == 0) {
+      inputTags[0].outerHTML = '<input id="tags" class="input" type="tags" placeholder="Add query" value="{{ tags|joinsep:',' }}">';
+    } else {
+      inputTags[index].remove();
+    }
+  }
+  // inputTags[0].outerHTML = '<input id="tags" class="input" type="tags" placeholder="Add query" value="{{ tags|joinsep:',' }}">';
+  setupTags();
+  var inputBox = document.querySelector("[placeholder='Add query']");
+  if (isFocused) {
+    inputBox.focus();
+  }
+</script>
\ No newline at end of file
diff --git a/core/templates/ui/drilldown/table_results_partial.html b/core/templates/ui/drilldown/table_results_partial.html
index cd7aa35..2da0314 100644
--- a/core/templates/ui/drilldown/table_results_partial.html
+++ b/core/templates/ui/drilldown/table_results_partial.html
@@ -1,7 +1,6 @@
 {% load django_tables2 %}
 {% load i18n %}
 {% load django_tables2_bulma_template %}
-{% load joinsep %}
 
 {% block table-wrapper %}
   <div class="container">
@@ -13,34 +12,38 @@
               {% block table.thead.row %}
                 <tr>
                   {% for column in table.columns %}
-                    {% block table.thead.th %}
-                      <th {% render_attrs column.attrs.th class="" %}>
-                        {% if column.orderable %}
-                          {% if column.is_ordered %}
-                            {% is_descending column.order_by as descending %}
-                            {% if descending %}
-                              <span class="icon" aria-hidden="true">{% block table.desc_icon %}<i class="fa-solid fa-sort-down"></i>{% endblock table.desc_icon %}</span>
+
+                    {% if column.name not in hide %}
+                      {% block table.thead.th %}
+                        <th {% render_attrs column.attrs.th class="" %}>
+                          {% if column.orderable %}
+                            {% if column.is_ordered %}
+                              {% is_descending column.order_by as descending %}
+                              {% if descending %}
+                                <span class="icon" aria-hidden="true">{% block table.desc_icon %}<i class="fa-solid fa-sort-down"></i>{% endblock table.desc_icon %}</span>
+                              {% else %}
+                                <span class="icon" aria-hidden="true">{% block table.asc_icon %}<i class="fa-solid fa-sort-up"></i>{% endblock table.asc_icon %}</span>
+                              {% endif %}
                             {% else %}
-                              <span class="icon" aria-hidden="true">{% block table.asc_icon %}<i class="fa-solid fa-sort-up"></i>{% endblock table.asc_icon %}</span>
+                              <span class="icon" aria-hidden="true">{% block table.orderable_icon %}<i class="fa-solid fa-sort"></i>{% endblock table.orderable_icon %}</span>
                             {% endif %}
+                            <a
+                              hx-get="search/{% querystring table.prefixed_order_by_field=column.order_by_alias.next %}&{{ uri }}"
+                              hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
+                              hx-trigger="click"
+                              hx-target="#results"
+                              hx-swap="innerHTML"
+                              hx-indicator=".progress"
+                              style="cursor: pointer;">
+                              {{ column.header }}
+                            </a>
                           {% else %}
-                            <span class="icon" aria-hidden="true">{% block table.orderable_icon %}<i class="fa-solid fa-sort"></i>{% endblock table.orderable_icon %}</span>
-                          {% endif %}
-                          <a
-                            hx-get="search/{% querystring table.prefixed_order_by_field=column.order_by_alias.next %}&{{ uri }}"
-                            hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
-                            hx-trigger="click"
-                            hx-target="#results"
-                            hx-swap="innerHTML"
-                            hx-indicator=".progress"
-                            style="cursor: pointer;">
                             {{ column.header }}
-                          </a>
-                        {% else %}
-                          {{ column.header }}
-                        {% endif %}
-                      </th>
-                    {% endblock table.thead.th %}
+                          {% endif %}
+                        </th>
+                      {% endblock table.thead.th %}
+                    {% endif %}
+
                   {% endfor %}
                 </tr>
               {% endblock table.thead.row %}
@@ -65,144 +68,151 @@
                              has-background-info-light
                            {% endif %}">
                   {% for column, cell in row.items %}
-                    {% block table.tbody.td %}
-                      {% if column.name == 'src' %}
-                        <td>
-                          <a class="has-text-link is-underlined"
-                             onclick="populateSearch('src', '{{ cell|escapejs }}')">
-                            {% if row.cells.src == 'irc' %}
-                              <span class="icon" data-tooltip="IRC">
-                                <i class="fa-solid fa-hashtag" aria-hidden="true"></i>
-                              </span>
-                            {% elif row.cells.src == 'dis' %}
-                              <span class="icon" data-tooltip="Discord">
-                                <i class="fa-brands fa-discord" aria-hidden="true"></i>
-                              </span>
-                            {% endif %}
-                          </a>
-                        </td>
-                      {% elif column.name == 'type' %}
-                        <td>
-                          <a class="has-text-link is-underlined"
-                             onclick="populateSearch('type', '{{ cell|escapejs }}')">
-                            {% if row.cells.type == 'msg' %}
-                              <span class="icon" data-tooltip="Message">
-                                <i class="fa-solid fa-message"></i>
-                              </span>
-                            {% elif row.cells.type == 'join' %}
-                              <span class="icon" data-tooltip="Join">
-                                <i class="fa-solid fa-person-to-portal"></i>
-                              </span>
-                            {% elif row.cells.type == 'part' %}
-                              <span class="icon" data-tooltip="Part">
-                                <i class="fa-solid fa-person-from-portal"></i>
-                              </span>
-                            {% elif row.cells.type == 'quit' %}
-                              <span class="icon" data-tooltip="Quit">
-                                <i class="fa-solid fa-circle-xmark"></i>
-                              </span>
-                            {% elif row.cells.type == 'kick' %}
-                              <span class="icon" data-tooltip="Kick">
-                                <i class="fa-solid fa-user-slash"></i>
-                              </span>
-                            {% elif row.cells.type == 'nick' %}
-                              <span class="icon" data-tooltip="Nick">
-                                <i class="fa-solid fa-signature"></i>
-                              </span>
-                            {% elif row.cells.type == 'mode' %}
-                              <span class="icon" data-tooltip="Mode">
-                                <i class="fa-solid fa-gear"></i>
-                              </span>
-                            {% elif row.cells.type == 'action' %}
-                              <span class="icon" data-tooltip="Action">
-                                <i class="fa-solid fa-exclamation"></i>
-                              </span>
-                            {% else %}
-                              {{ row.cells.type }}
-                            {% endif %}
-                          </a>
-                        </td>
-                      {% elif column.name == 'msg' %}
-                        <td style="max-width: 10em" class="wrap">{{ row.cells.msg }}</td>
-                      {% elif column.name == 'host' %}
-                        <td>
-                          <a class="has-text-link is-underlined"
-                             onclick="populateSearch('host', '{{ cell|escapejs }}')">
-                            {{ cell }}
-                          </a>
-                        </td>
-                      {% elif column.name == 'nick' %}
-                        <td>
-                          <div class="nowrap-parent">
-                            <div class="nowrap-child">
-                              {% if row.cells.online is True %}
-                                <span class="icon has-text-success has-tooltip-success" data-tooltip="Online">
-                                  <i class="fa-solid fa-circle"></i>
+                    {% if column.name not in hide %}
+                      {% block table.tbody.td %}
+                        {% if column.name == 'src' %}
+                          <td>
+                            <a class="has-text-link is-underlined"
+                              onclick="populateSearch('src', '{{ cell|escapejs }}')">
+                              {% if row.cells.src == 'irc' %}
+                                <span class="icon" data-tooltip="IRC">
+                                  <i class="fa-solid fa-hashtag" aria-hidden="true"></i>
                                 </span>
-                              {% elif row.cells.online is False %}
-                                <span class="icon has-text-danger has-tooltip-danger" data-tooltip="Offline">
-                                  <i class="fa-solid fa-circle"></i>
+                              {% elif row.cells.src == 'dis' %}
+                                <span class="icon" data-tooltip="Discord">
+                                  <i class="fa-brands fa-discord" aria-hidden="true"></i>
                                 </span>
-                              {% else %}
-                                <span class="icon has-text-warning has-tooltip-warning" data-tooltip="Unknown">
-                                  <i class="fa-solid fa-circle"></i>
+                              {% endif %}
+                            </a>
+                          </td>
+                        {% elif column.name == 'ts' %}
+                          <td>
+                            <p>{{ row.cells.date }}</p>
+                            <p>{{ row.cells.time }}</p>
+                          </td>
+                        {% elif column.name == 'type' %}
+                          <td>
+                            <a class="has-text-link is-underlined"
+                              onclick="populateSearch('type', '{{ cell|escapejs }}')">
+                              {% if row.cells.type == 'msg' %}
+                                <span class="icon" data-tooltip="Message">
+                                  <i class="fa-solid fa-message"></i>
+                                </span>
+                              {% elif row.cells.type == 'join' %}
+                                <span class="icon" data-tooltip="Join">
+                                  <i class="fa-solid fa-person-to-portal"></i>
+                                </span>
+                              {% elif row.cells.type == 'part' %}
+                                <span class="icon" data-tooltip="Part">
+                                  <i class="fa-solid fa-person-from-portal"></i>
+                                </span>
+                              {% elif row.cells.type == 'quit' %}
+                                <span class="icon" data-tooltip="Quit">
+                                  <i class="fa-solid fa-circle-xmark"></i>
+                                </span>
+                              {% elif row.cells.type == 'kick' %}
+                                <span class="icon" data-tooltip="Kick">
+                                  <i class="fa-solid fa-user-slash"></i>
+                                </span>
+                              {% elif row.cells.type == 'nick' %}
+                                <span class="icon" data-tooltip="Nick">
+                                  <i class="fa-solid fa-signature"></i>
+                                </span>
+                              {% elif row.cells.type == 'mode' %}
+                                <span class="icon" data-tooltip="Mode">
+                                  <i class="fa-solid fa-gear"></i>
                                 </span>
+                              {% elif row.cells.type == 'action' %}
+                                <span class="icon" data-tooltip="Action">
+                                  <i class="fa-solid fa-exclamation"></i>
+                                </span>
+                              {% else %}
+                                {{ row.cells.type }}
                               {% endif %}
-                            </div>
-                            <a class="nowrap-child has-text-link is-underlined" onclick="populateSearch('nick', '{{ cell|escapejs }}')">
+                            </a>
+                          </td>
+                        {% elif column.name == 'msg' %}
+                          <td style="max-width: 10em" class="wrap">{{ row.cells.msg }}</td>
+                        {% elif column.name == 'host' %}
+                          <td>
+                            <a class="has-text-link is-underlined"
+                              onclick="populateSearch('host', '{{ cell|escapejs }}')">
                               {{ cell }}
                             </a>
-                            <div class="nowrap-child">
-                              {% if row.cells.src == 'irc' %}
-                                <button
-                                  hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
-                                  hx-post="{% url 'modal_drilldown' %}"
-                                  hx-vals='{"net": "{{ row.cells.net }}", "nick": "{{ row.cells.nick }}", "channel": "{{ row.cells.channel }}"}'
-                                  hx-target="#modals-here" 
-                                  hx-trigger="click"
-                                  class="button is-small">
-                                  Information
-                                </button>
-                              {% endif %}
-                            </div>
-                            {% if row.cells.num_chans is not None %}
+                          </td>
+                        {% elif column.name == 'nick' %}
+                          <td>
+                            <div class="nowrap-parent">
                               <div class="nowrap-child">
-                                <span class="tag">
-                                  {{ row.cells.num_chans }}
-                                </span>
+                                {% if row.cells.online is True %}
+                                  <span class="icon has-text-success has-tooltip-success" data-tooltip="Online">
+                                    <i class="fa-solid fa-circle"></i>
+                                  </span>
+                                {% elif row.cells.online is False %}
+                                  <span class="icon has-text-danger has-tooltip-danger" data-tooltip="Offline">
+                                    <i class="fa-solid fa-circle"></i>
+                                  </span>
+                                {% else %}
+                                  <span class="icon has-text-warning has-tooltip-warning" data-tooltip="Unknown">
+                                    <i class="fa-solid fa-circle"></i>
+                                  </span>
+                                {% endif %}
                               </div>
-                            {% endif %}
-                          </div>
-                        </td>
-                      {% elif column.name == 'channel' %}
-                        <td>
-                          <div class="nowrap-parent">
-                            <a class="nowrap-child has-text-link is-underlined"
-                               onclick="populateSearch('channel', '{{ cell|escapejs }}')">
-                              {{ cell }}
-                            </a>
-                            {% if row.cells.num_users is not None %}
+                              <a class="nowrap-child has-text-link is-underlined" onclick="populateSearch('nick', '{{ cell|escapejs }}')">
+                                {{ cell }}
+                              </a>
                               <div class="nowrap-child">
-                                <span class="tag">
-                                  {{ row.cells.num_users }}
-                                </span>
+                                {% if row.cells.src == 'irc' %}
+                                  <button
+                                    hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
+                                    hx-post="{% url 'modal_drilldown' %}"
+                                    hx-vals='{"net": "{{ row.cells.net }}", "nick": "{{ row.cells.nick }}", "channel": "{{ row.cells.channel }}"}'
+                                    hx-target="#modals-here" 
+                                    hx-trigger="click"
+                                    class="button is-small">
+                                    Information
+                                  </button>
+                                {% endif %}
                               </div>
-                            {% endif %}
-                          </div>
-                        </td>
-                      {% elif column.name == 'net' %}
-                        <td>
-                          <a class="has-text-link is-underlined"
-                             onclick="populateSearch('net', '{{ cell|escapejs }}')">
+                              {% if row.cells.num_chans is not None %}
+                                <div class="nowrap-child">
+                                  <span class="tag">
+                                    {{ row.cells.num_chans }}
+                                  </span>
+                                </div>
+                              {% endif %}
+                            </div>
+                          </td>
+                        {% elif column.name == 'channel' %}
+                          <td>
+                            <div class="nowrap-parent">
+                              <a class="nowrap-child has-text-link is-underlined"
+                                onclick="populateSearch('channel', '{{ cell|escapejs }}')">
+                                {{ cell }}
+                              </a>
+                              {% if row.cells.num_users is not None %}
+                                <div class="nowrap-child">
+                                  <span class="tag">
+                                    {{ row.cells.num_users }}
+                                  </span>
+                                </div>
+                              {% endif %}
+                            </div>
+                          </td>
+                        {% elif column.name == 'net' %}
+                          <td>
+                            <a class="has-text-link is-underlined"
+                              onclick="populateSearch('net', '{{ cell|escapejs }}')">
+                              {{ cell }}
+                            </a>
+                          </td>
+                        {% else %}
+                          <td>
                             {{ cell }}
-                          </a>
-                        </td>
-                      {% else %}
-                        <td>
-                          {{ cell }}
-                        </td>
-                      {% endif %}
-                    {% endblock table.tbody.td %}
+                          </td>
+                        {% endif %}
+                      {% endblock table.tbody.td %}
+                    {% endif %}
                   {% endfor %}
                 </tr>
               {% endblock table.tbody.row %}
@@ -309,24 +319,4 @@
       {% endif %}
     {% endblock pagination %}
   </div>
-  {# Update the tags in case the user changed the query #}
-  {# Check for focus and refocus #}
-  <script>
-    var inputTags = document.getElementsByClassName('tags-input');
-    var inputBox = document.querySelector("[placeholder='Add query']");
-    var isFocused = (document.activeElement === inputBox);
-    for (index = 0; index < inputTags.length; index++) {
-      if (index == 0) {
-        inputTags[0].outerHTML = '<input id="tags" class="input" type="tags" placeholder="Add query" value="{{ tags|joinsep:',' }}">';
-      } else {
-        inputTags[index].remove();
-      }
-    }
-    // inputTags[0].outerHTML = '<input id="tags" class="input" type="tags" placeholder="Add query" value="{{ tags|joinsep:',' }}">';
-    setupTags();
-    var inputBox = document.querySelector("[placeholder='Add query']");
-    if (isFocused) {
-      inputBox.focus();
-    }
-  </script>
 {% endblock table-wrapper %}
\ No newline at end of file
diff --git a/core/views/ui/drilldown.py b/core/views/ui/drilldown.py
index e1882ba..829c28c 100644
--- a/core/views/ui/drilldown.py
+++ b/core/views/ui/drilldown.py
@@ -190,6 +190,7 @@ class DrilldownTableView(SingleTableView):
         for k, v in self.context.items():
             if k not in context:
                 context[k] = v
+        context["hide"] = ["date", "time", "id", "num", "channel_nsfw", "num_users", "num_chans", "exemption", "version_sentiment"]
 
         if request.method == "GET":
             if not request.htmx:
diff --git a/core/views/ui/tables.py b/core/views/ui/tables.py
index d5c8b30..2d2f0a7 100644
--- a/core/views/ui/tables.py
+++ b/core/views/ui/tables.py
@@ -5,9 +5,8 @@ from django_tables2.columns.base import BoundColumn
 # Make the table column headings lowercase
 orig_Column_header = BoundColumn.header
 
-
 @property
-def lower_header(self):
+def format_header(self):
     header = orig_Column_header.__get__(self)
     header = header.lower()
     header = header.title()
@@ -20,8 +19,7 @@ def lower_header(self):
 
     return header
 
-
-BoundColumn.header = lower_header
+BoundColumn.header = format_header
 
 
 class DrilldownTable(Table):
@@ -38,8 +36,8 @@ class DrilldownTable(Table):
     num = Column()
     src = Column()
     ts = Column()
-    # date = Column()
-    # time = Column()
+    date = Column()
+    time = Column()
     type = Column()
     bot = Column()
     channel = Column()