Use maintenance column layout preset in filter preview

Author: Simrayz

src/argus/htmx/defaults.py

@@ -29,10 +29,12 @@
         "events",
     ],
     "on maintenance": [
+        "start_time",
+        "level",
         "source_type",
         "source",
+        "description",
         "tags",
-        "under_maintenance",
     ],
 }
 ARGUS_HTMX_FILTER_FUNCTION = "argus.htmx.incident.filter.incident_list_filter"

src/argus/htmx/incident/columns.py

@@ -21,6 +21,7 @@
 CELL_WRAPPER_TEMPLATE_LINK_TO_DETAILS = "htmx/incident/_incident_table_cell_wrapper_link_to_details.html"
 
 BUILTIN_COLUMN_LAYOUT_NAME = "built-in"
+MAINTENANCE_COLUMN_LAYOUT_NAME = "on maintenance"
 _DEFAULT_COLUMN_LAYOUT_NAME = "default"
 
 

src/argus/htmx/plannedmaintenance/views.py

@@ -11,7 +11,7 @@
 from django.views.generic import CreateView, DeleteView, DetailView, ListView, UpdateView
 
 from argus.filter.queryset_filters import QuerySetFilter
-from argus.htmx.incident.columns import BUILTIN_COLUMNS
+from argus.htmx.incident.columns import get_incident_table_columns, MAINTENANCE_COLUMN_LAYOUT_NAME
 from argus.htmx.utils import TemplateNameViewMixin
 from argus.htmx.widgets import SearchDropdownMultiSelect
 from argus.incident.models import Incident
@@ -20,7 +20,6 @@
 from argus.util.datetime_utils import LOCAL_INFINITY
 
 FLATPICKR_DATETIME_FORMAT = "%Y-%m-%d %H:%M"
-FILTER_PREVIEW_COLUMNS = ["start_time", "level", "source_type", "source", "description", "tags"]
 FILTER_PREVIEW_LIMIT = 5
 
 
@@ -218,6 +217,7 @@ def filter_preview(request):
     matching_count = matching_qs.count()
     matching_percent = round(100 * matching_count / total_open) if total_open else 0
     incident_list = matching_qs.select_related("source").order_by("-start_time")[:FILTER_PREVIEW_LIMIT]
+    columns = get_incident_table_columns(MAINTENANCE_COLUMN_LAYOUT_NAME)
 
     return render(
         request,
@@ -227,7 +227,7 @@ def filter_preview(request):
             "matching_percent": matching_percent,
             "total_open": total_open,
             "incident_list": incident_list,
-            "columns": [BUILTIN_COLUMNS[name] for name in FILTER_PREVIEW_COLUMNS],
+            "columns": columns,
             "compact": True,
             "dummy_column": True,
         },