Compare commits

...

2 Commits

Author SHA1 Message Date
6fe31d99a9
Re-add matches field 2023-02-13 17:23:30 +00:00
1ab7a95ebd
Remove debug statements 2023-02-13 17:23:27 +00:00
3 changed files with 11 additions and 3 deletions

View File

@ -214,6 +214,15 @@ class NotificationRule(models.Model):
raise ValueError(f"Invalid YAML: {e}") raise ValueError(f"Invalid YAML: {e}")
return parsed return parsed
@property
def matches(self):
"""
Get the total number of matches for this rule.
"""
if isinstance(self.match, dict):
truthy_values = [x for x in self.match.values() if x is not False]
return f"{len(truthy_values)}/{len(self.match)}"
def get_notification_settings(self, check=True): def get_notification_settings(self, check=True):
""" """
Get the notification settings for this rule. Get the notification settings for this rule.

View File

@ -20,6 +20,7 @@
<th>topic</th> <th>topic</th>
<th>enabled</th> <th>enabled</th>
<th>data length</th> <th>data length</th>
<th>match</th>
<th>actions</th> <th>actions</th>
</thead> </thead>
{% for item in object_list %} {% for item in object_list %}
@ -43,6 +44,7 @@
{% endif %} {% endif %}
</td> </td>
<td>{{ item.data|length }}</td> <td>{{ item.data|length }}</td>
<td>{{ item.matches }}</td>
<td> <td>
<div class="buttons"> <div class="buttons">
<button <button

View File

@ -113,7 +113,6 @@ class DrilldownTableView(SingleTableView):
sizes = settings.MAIN_SIZES sizes = settings.MAIN_SIZES
if request.GET: if request.GET:
print("GET")
self.template_name = "index.html" self.template_name = "index.html"
# GET arguments in URL like ?query=xyz # GET arguments in URL like ?query=xyz
query_params = request.GET.dict() query_params = request.GET.dict()
@ -121,7 +120,6 @@ class DrilldownTableView(SingleTableView):
if request.resolver_match.url_name == "search_partial": if request.resolver_match.url_name == "search_partial":
self.template_name = "partials/results_table.html" self.template_name = "partials/results_table.html"
elif request.POST: elif request.POST:
print("POST")
query_params = request.POST.dict() query_params = request.POST.dict()
else: else:
self.template_name = "index.html" self.template_name = "index.html"
@ -129,7 +127,6 @@ class DrilldownTableView(SingleTableView):
# Don't try to search, since there's clearly nothing to do # Don't try to search, since there's clearly nothing to do
params_with_defaults = {} params_with_defaults = {}
add_defaults(params_with_defaults) add_defaults(params_with_defaults)
print("GOT TO CONTEXT")
context = { context = {
"sizes": sizes, "sizes": sizes,
"params": params_with_defaults, "params": params_with_defaults,