Add additional filters to scanner query rules/results (#23984)

* Add additional filters to scanner query rules/results

* Test filters list

* More testing

* Cleanup

* Unused var

* Missing </li>

* Add no-op migration for files model change

---------

Co-authored-by: Andrew Williamson <[email protected]>

Author: diox

src/olympia/amo/admin.py

@@ -22,7 +22,10 @@
 from django.utils.html import format_html, format_html_join
 
 from django_vite.templatetags.django_vite import vite_hmr_client
-from rangefilter.filters import DateRangeFilter as DateRangeFilterBase
+from rangefilter.filters import (
+    DateRangeFilter as DateRangeFilterBase,
+    NumericRangeFilter as NumericRangeFilterBase,
+)
 
 from olympia.activity.models import IPLog
 from olympia.amo.models import GroupConcat, Inet6Ntoa
@@ -642,6 +645,27 @@ def choices(self, changelist):
         yield all_choice
 
 
+class NumericRangeFilter(FakeChoicesMixin, NumericRangeFilterBase):
+    """
+    Custom rangefilter.filters.NumericRangeFilter class without the need for
+    inline CSS/JavaScript.
+
+    Needs FakeChoicesMixin for the fake choices the template will be using (the
+    upstream implementation depends on inline JavaScript for this, which we
+    want to avoid).
+    """
+
+    template = 'admin/amo/numeric_range_filter.html'
+
+    def choices(self, changelist):
+        # We want a fake 'All' choice as per FakeChoicesMixin, but as of 0.3.15
+        # rangefilter's implementation doesn't bother setting the selected
+        # property, and our mixin calls super(), so we have to do it here.
+        all_choice = next(super().choices(changelist))
+        all_choice['selected'] = not any(self.used_parameters)
+        yield all_choice
+
+
 class MultipleRelatedListFilter(admin.SimpleListFilter):
     template = 'admin/amo/multiple_filter.html'
 

src/olympia/amo/templates/admin/amo/date_range_filter.html

@@ -1,4 +1,5 @@
-<h3>By {{ title }}</h3>
+<details data-filter-title="{{ title }}" open>
+<summary>By {{ title }}</summary>
 {% with choices.0 as all_choice %}
 <form method="GET" action=".">
     <div>
@@ -24,3 +25,4 @@ <h3>By {{ title }}</h3>
     </ul>
 </form>
 {% endwith %}
+</details>

src/olympia/amo/templates/admin/amo/numeric_range_filter.html

@@ -0,0 +1,29 @@
+<details data-filter-title="{{ title }}" open>
+<summary>By {{ title }}</summary>
+{% with choices.0 as all_choice %}
+<form method="GET" action=".">
+    <div>
+        {# Use .params.lists to properly support multiple values - so that if a filter using this template is present multiple times on the page, its current values are all passed to the new page when submitting this form #}
+        {% for key, values in all_choice.params.lists %}
+            {% for value in values %}
+                <input type="hidden" name="{{ key }}" value="{{ value }}" />
+            {% endfor %}
+        {% endfor %}
+    </div>
+    <ul>
+        <li {% if all_choice.selected %}class="selected"{% endif %}>
+            <a href="{{ all_choice.query_string }}">All</a>
+        </li>
+        <li>
+            {% for field in spec.form %}
+                {{ field.errors }}
+                {{ field.label_tag }} {{ field }}
+            {% endfor %}
+        </li>
+        <li>
+            <input type="submit" value="Submit" />
+        </li>
+    </ul>
+</form>
+{% endwith %}
+</details>

src/olympia/amo/tests/__init__.py

@@ -767,7 +767,7 @@ def addon_factory(status=amo.STATUS_APPROVED, version_kw=None, file_kw=None, **k
 
     # version_changed task will be triggered and will update last_updated in
     # database for this add-on depending on the state of the version / files.
-    # We're calling the function it uses to compute the value ourselves and=
+    # We're calling the function it uses to compute the value ourselves and
     # sticking that into the attribute ourselves so that we already have the
     # correct value in the instance we are going to return.
     # Note: the aim is to have the instance consistent with what will be in the

src/olympia/files/migrations/0036_alter_file_datestatuschanged.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.2.24 on 2025-10-03 17:51
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('files', '0035_remove_file_reviewed'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='file',
+            name='datestatuschanged',
+            field=models.DateTimeField(default=django.utils.timezone.now, null=True),
+        ),
+    ]

src/olympia/files/models.py

@@ -11,6 +11,7 @@
 from django.db import models
 from django.dispatch import receiver
 from django.urls import reverse
+from django.utils import timezone
 from django.utils.crypto import get_random_string
 from django.utils.encoding import force_str
 from django.utils.functional import cached_property
@@ -112,7 +113,7 @@ class File(OnChangeMixin, ModelBase):
     status = models.PositiveSmallIntegerField(
         choices=STATUS_CHOICES.items(), default=amo.STATUS_AWAITING_REVIEW
     )
-    datestatuschanged = models.DateTimeField(null=True, auto_now_add=True)
+    datestatuschanged = models.DateTimeField(null=True, default=timezone.now)
     strict_compatibility = models.BooleanField(default=False)
     approval_date = models.DateTimeField(null=True)
     # Serial number of the certificate use for the signature.

src/olympia/scanners/admin.py

@@ -15,7 +15,12 @@
 from olympia import amo
 from olympia.access import acl
 from olympia.addons.models import Addon
-from olympia.amo.admin import AMOModelAdmin, MultipleRelatedListFilter
+from olympia.amo.admin import (
+    AMOModelAdmin,
+    DateRangeFilter,
+    MultipleRelatedListFilter,
+    NumericRangeFilter,
+)
 from olympia.amo.templatetags.jinja_helpers import vite_asset
 from olympia.amo.utils import is_safe_url
 from olympia.constants import scanners
@@ -202,6 +207,24 @@ def __init__(self, *args, **kwargs):
         self.title = 'version channel'
 
 
+class VersionCreatedFilter(DateRangeFilter):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.title = 'version creation date'
+
+
+class AddonCreatedFilter(DateRangeFilter):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.title = 'add-on creation date'
+
+
+class AddonLastUpdatedFilter(DateRangeFilter):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.title = 'add-on last updated date'
+
+
 class AddonStatusFilter(admin.ChoicesFieldListFilter):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -230,6 +253,12 @@ def choices(self, changelist):
             }
 
 
+class AddonAverageDailyUsers(NumericRangeFilter):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.title = 'add-on ADU'
+
+
 class FileStatusFilter(admin.ChoicesFieldListFilter):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -735,8 +764,12 @@ class ScannerQueryResultAdmin(AbstractScannerResultAdminMixin, AMOModelAdmin):
     list_filter = (
         ('matched_rule', ScannerRuleListFilter),
         ('version__channel', VersionChannelFilter),
+        ('version__created', VersionCreatedFilter),
         ('version__addon__status', AddonStatusFilter),
+        ('version__addon__created', AddonCreatedFilter),
+        ('version__addon__last_updated', AddonLastUpdatedFilter),
         ('version__addon__disabled_by_user', AddonVisibilityFilter),
+        ('version__addon__average_daily_users', AddonAverageDailyUsers),
         ('version__file__status', FileStatusFilter),
         ('version__file__is_signed', FileIsSignedFilter),
         ('was_blocked', admin.BooleanFieldListFilter),
@@ -848,7 +881,10 @@ class ScannerQueryRuleAdmin(AbstractScannerRuleAdminMixin, AMOModelAdmin):
         'completion_rate',
         'matched_results_link',
     )
-    list_filter = ('state',)
+    list_filter = (
+        'scanner',
+        'state',
+    )
     fields = (
         'scanner',
         'run_on_disabled_addons',