Pathogen
/
neptune
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Properly format templates

This commit is contained in:
Mark Veidemanis 2022-08-09 11:54:44 +01:00
parent ba51922fe9
commit 220a4e2451
Signed by: m
GPG Key ID: 5ACFCEED46C0904F
9 changed files with 122 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/urls.py
View File

@ -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 (

12
core/lib/opensearch.py
View File

@ -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 = {

3
core/templates/ui/drilldown/drilldown.html
View File

@ -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>

20
core/templates/ui/drilldown/results.html
View File

@ -4,7 +4,6 @@
{% 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>
@ -48,21 +47,20 @@
</thead>
<tbody>
{% for item in results %}
{% if item.exemption == True %}
<tr class="has-background-grey-lighter">
{# Workaround for curlylint #}
<tr class="{% if item.exemption == True %}
has-background-grey-lighter
{% elif item.type == 'join' %}
<tr class="has-background-success-light">
has-background-success-light
{% elif item.type == 'quit' %}
<tr class="has-background-danger-light">
has-background-danger-light
{% elif item.type == 'kick' %}
<tr class="has-background-danger-light">
has-background-danger-light
{% elif item.type == 'part' %}
<tr class="has-background-warning-light">
has-background-warning-light
{% elif item.type == 'mode' %}
<tr class="has-background-info-light">
{% else %}
<tr>
{% endif %}
has-background-info-light
{% endif %}">
<td>
<a class="has-text-link is-underlined"
onclick="toggleTag('src', '{{ item.src|escapejs }}')">

12
core/templates/ui/drilldown/table_results_partial.html
View File

@ -9,7 +9,8 @@
<thead {{ table.attrs.thead.as_html }}>
<tr>
{% for column in table.columns %}
<th {{ column.attrs.th.as_html }}
<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"
@ -28,7 +29,8 @@
{# Pagination block overrides #}
{% block pagination.previous %}
<li class="previous page-item">
<div hx-post="{% querystring table.prefixed_page_field=table.page.previous_page_number %}"
<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"
@ -43,7 +45,8 @@
{% 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"
<div
class="page-link"
{% if p != '...' %}hx-post="{% querystring table.prefixed_page_field=p %}"{% endif %}
hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
hx-trigger="click"
@ -57,7 +60,8 @@
{% endblock pagination.range %}
{% block pagination.next %}
<li class="next page-item">
<div hx-post="{% querystring table.prefixed_page_field=table.page.next_page_number %}"
<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"

8
core/templatetags/hy.py Normal file
View File

@ -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 "_"

3
core/views/ui/drilldown.py
View File

@ -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")

3
core/views/ui/tables.py
View File

@ -1,4 +1,5 @@
from django_tables2 import Table, Column
from django_tables2 import Column, Table
class DrilldownTable(Table):
id = Column()