feat(logs): add connection and run-by-you filters

explorer/templates/explorer/querylog_list.html

@@ -4,6 +4,28 @@
 {% block sql_explorer_content %}
     <div class="container">
         <h3>{% blocktranslate with pagenum=page_obj.number %}Recent Query Logs - Page {{pagenum}}{% endblocktranslate %}</h3>
+        <form method="get" class="row g-2 align-items-end mb-3">
+            {% if query_id %}<input type="hidden" name="query_id" value="{{ query_id }}">{% endif %}
+            <div class="col-auto">
+                <label for="connection" class="form-label">{% translate "Database Connection" %}</label>
+                <select name="connection" id="connection" class="form-select">
+                    <option value="">{% translate "All connections" %}</option>
+                    {% for conn in database_connections %}
+                        <option value="{{ conn.id }}"{% if conn.id == selected_connection %} selected{% endif %}>{{ conn }}</option>
+                    {% endfor %}
+                </select>
+            </div>
+            <div class="col-auto">
+                <div class="form-check">
+                    <input type="checkbox" name="run_by_me" value="1" id="run_by_me" class="form-check-input"{% if run_by_me %} checked{% endif %}>
+                    <label for="run_by_me" class="form-check-label">{% translate "Run by you" %}</label>
+                </div>
+            </div>
+            <div class="col-auto">
+                <button type="submit" class="btn btn-primary">{% translate "Filter" %}</button>
+                <a href="{% url 'explorer_logs' %}{% if query_id %}?query_id={{ query_id }}{% endif %}" class="btn btn-secondary">{% translate "Clear" %}</a>
+            </div>
+        </form>
         <table class="table table-striped query-list">
             <thead>
                 <tr>
@@ -50,15 +72,15 @@ <h3>{% blocktranslate with pagenum=page_obj.number %}Recent Query Logs - Page {{
             <div class="pagination">
                 <span>
                     {% if page_obj.has_previous %}
-                        <a href="?page={{ page_obj.previous_page_number }}"><i class="bi-arrow-left-square"></i></a>
+                        <a href="?page={{ page_obj.previous_page_number }}{% if filter_querystring %}&{{ filter_querystring }}{% endif %}"><i class="bi-arrow-left-square"></i></a>
                     {% endif %}
                     <span class="page-current">
                         {% blocktranslate trimmed with pnum=page_obj.number anum=page_obj.paginator.num_pages %}
                             Page {{ pnum }} of {{ anum }}
                         {% endblocktranslate %}
                     </span>
                     {% if page_obj.has_next %}
-                        <a href="?page={{ page_obj.next_page_number }}"><i class="bi-arrow-right-square"></i></a>
+                        <a href="?page={{ page_obj.next_page_number }}{% if filter_querystring %}&{{ filter_querystring }}{% endif %}"><i class="bi-arrow-right-square"></i></a>
                     {% endif %}
                 </span>
             </div>

explorer/tests/test_views.py

@@ -809,6 +809,28 @@ def test_query_gets_logged_and_appears_on_log_page(self):
         resp = self.client.get(reverse("explorer_logs"))
         self.assertContains(resp, "select 12345;")
 
+    def test_filter_logs_by_connection(self):
+        other_conn = DatabaseConnection.objects.create(
+            alias="filter_conn", engine="django.db.backends.sqlite3", name=":memory:"
+        )
+        QueryLogFactory(sql="select default conn;")
+        QueryLogFactory(sql="select other conn;", database_connection_id=other_conn.id)
+        resp = self.client.get(f"{reverse('explorer_logs')}?connection={other_conn.id}")
+        self.assertContains(resp, "select other conn;")
+        self.assertNotContains(resp, "select default conn;")
+        # an invalid connection value is ignored and shows everything
+        resp = self.client.get(f"{reverse('explorer_logs')}?connection=notanid")
+        self.assertContains(resp, "select other conn;")
+        self.assertContains(resp, "select default conn;")
+
+    def test_filter_logs_run_by_me(self):
+        other = User.objects.create_superuser("other", "other@other.com", "pwd")
+        QueryLogFactory(sql="select mine;", run_by_user=self.user)
+        QueryLogFactory(sql="select theirs;", run_by_user=other)
+        resp = self.client.get(f"{reverse('explorer_logs')}?run_by_me=1")
+        self.assertContains(resp, "select mine;")
+        self.assertNotContains(resp, "select theirs;")
+
     def test_admin_required(self):
         self.client.logout()
         resp = self.client.get(reverse("explorer_logs"))

explorer/views/list.py

@@ -6,7 +6,7 @@
 
 from explorer import app_settings
 from explorer.models import Query, QueryFavorite, QueryLog
-from explorer.utils import allowed_query_pks, url_get_query_id
+from explorer.utils import allowed_query_pks, get_int_from_request, url_get_query_id
 from explorer.views.auth import PermissionRequiredMixin
 from explorer.views.mixins import ExplorerContextMixin
 from explorer.ee.db_connections.models import DatabaseConnection
@@ -136,4 +136,21 @@ def get_queryset(self):
         kwargs = {"sql__isnull": False}
         if url_get_query_id(self.request):
             kwargs["query_id"] = url_get_query_id(self.request)
+        connection_id = get_int_from_request(self.request, "connection", None)
+        if connection_id:
+            kwargs["database_connection_id"] = connection_id
+        if self.request.GET.get("run_by_me") and self.request.user.is_authenticated:
+            kwargs["run_by_user"] = self.request.user
         return QueryLog.objects.filter(**kwargs).all()
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        params = self.request.GET.copy()
+        if "page" in params:
+            del params["page"]
+        context["database_connections"] = DatabaseConnection.objects.all()
+        context["selected_connection"] = get_int_from_request(self.request, "connection", None)
+        context["run_by_me"] = bool(self.request.GET.get("run_by_me"))
+        context["query_id"] = url_get_query_id(self.request)
+        context["filter_querystring"] = params.urlencode()
+        return context