fix(10401) update filter titles for sorting on discovered and added s…

…ame for mitigated

dojo/filters.py

@@ -1423,6 +1423,9 @@ class ApiFindingFilter(DojoFilter):
     jira_change = DateRangeFilter(field_name='jira_issue__jira_change')
     last_reviewed = DateRangeFilter()
     mitigated = DateRangeFilter()
+    mitigated_on = DateFilter(field_name='mitigated', lookup_expr='exact')
+    mitigated_before = DateFilter(field_name='mitigated', lookup_expr='lt')
+    mitigated_after = DateFilter(field_name='mitigated', lookup_expr='gt')
     # NumberInFilter
     cwe = NumberInFilter(field_name='cwe', lookup_expr='in')
     defect_review_requested_by = NumberInFilter(field_name='defect_review_requested_by', lookup_expr='in')
@@ -1540,17 +1543,18 @@ def filter(self, qs, value):
 class FindingFilterHelper(FilterSet):
     title = CharFilter(lookup_expr="icontains")
     date = DateFromToRangeFilter(field_name='date', label="Date Discovered")
-    on = DateFilter(field_name="date", lookup_expr="exact", label="On")
-    before = DateFilter(field_name="date", lookup_expr="lt", label="Before")
-    after = DateFilter(field_name="date", lookup_expr="gt", label="After")
+    on = DateFilter(field_name="date", lookup_expr="exact", label="Discovered On")
+    before = DateFilter(field_name="date", lookup_expr="lt", label="Discovered Before")
+    after = DateFilter(field_name="date", lookup_expr="gt", label="Discovered After")
     last_reviewed = DateRangeFilter()
     last_status_update = DateRangeFilter()
     cwe = MultipleChoiceFilter(choices=[])
     vulnerability_id = CharFilter(method=vulnerability_id_filter, label="Vulnerability Id")
     severity = MultipleChoiceFilter(choices=SEVERITY_CHOICES)
     duplicate = ReportBooleanFilter()
     is_mitigated = ReportBooleanFilter()
-    mitigated = DateRangeFilter(label="Mitigated Date")
+    mitigated_date = DateFromToRangeFilter(field_name='mitigated_date', label="Mitigated Date")
+    mitigated_on = DateFilter(field_name="mitigated_date", lookup_expr="exact", label="Mitigated On")
     planned_remediation_date = DateRangeOmniFilter()
     planned_remediation_version = CharFilter(lookup_expr="icontains", label=_("Planned remediation version"))
     file_path = CharFilter(lookup_expr="icontains")
@@ -1659,6 +1663,10 @@ def set_date_fields(self, *args: list, **kwargs: dict):
         self.form.fields['on'].widget = date_input_widget
         self.form.fields['before'].widget = date_input_widget
         self.form.fields['after'].widget = date_input_widget
+        date_mitigated_input_widget = forms.DateInput(attrs={'class': 'datepicker', 'placeholder': 'YYYY-MM-DD'}, format="%Y-%m-%d")
+        self.form.fields['on'].widget = date_mitigated_input_widget
+        self.form.fields['before'].widget = date_mitigated_input_widget
+        self.form.fields['after'].widget = date_mitigated_input_widget
         self.form.fields['cwe'].choices = cwe_options(self.queryset)