Better error handling for dates, added submitted filter criteria (#4549)

Fixes #4548. This handles an invalid date the same as
invalid/non-existent query params rather than erroring out. ~~In the
long term, it would be better to indicate to the user that something
wasn't right with their query though or no results were brought.~~ When
an invalid query is entered, it'll show the no results prompt!

I also added the submitted drop down filter, as staff have been using
that a bit recently

Author: wes-otf

hypha/apply/funds/templates/submissions/all.html

@@ -365,12 +365,17 @@
             <nav x-show="!showSelectedSubmissions"
                  class="flex flex-wrap gap-2 items-center menu-filters"
             >
-                <div id="filterupdated" aria-label="Filter by Updated" class="flex items-center">
+                <div id="filtersubmitted" aria-label="Filter by Submitted" class="flex items-center" data-query="submitted">
+                    <button class="flex justify-between items-center py-1 w-full font-medium text-gray-600 border cursor-pointer md:p-0 md:border-none hover:bg-gray-50 ps-2 pe-2 md:pe-4 md:hover:bg-transparent md:hover:text-blue-700">
+                        {% trans "Submitted" %}
+                        {% heroicon_mini "chevron-down" aria_hidden="true" width=18 height=18 class="hidden md:inline-block" %}
+                    </button>
+                </div>
+                <div id="filterupdated" aria-label="Filter by Updated" class="flex items-center" data-query="updated">
                     <button class="flex justify-between items-center py-1 w-full font-medium text-gray-600 border cursor-pointer md:p-0 md:border-none hover:bg-gray-50 ps-2 pe-2 md:pe-4 md:hover:bg-transparent md:hover:text-blue-700">
                         {% trans "Updated" %}
                         {% heroicon_mini "chevron-down" aria_hidden="true" width=18 height=18 class="hidden md:inline-block" %}
                     </button>
-
                 </div>
 
                 {% dropdown_menu title="Status" heading="Filter by current status" enable_search=True %}
@@ -609,23 +614,28 @@ <h2 class='text-2xl'>{% trans "No results matched your search" %}</h2>
             var start = moment().subtract(29, 'days');
             var end = moment();
 
-            $('#filterupdated').daterangepicker({
-                startDate: start,
-                endDate: end,
-                ranges: {
-                    '{% trans "Today" %}': [moment(), moment()],
-                    '{% trans "Yesterday" %}': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
-                    '{% trans "Last 7 Days" %}': [moment().subtract(6, 'days'), moment()],
-                    '{% trans "Last 30 Days" %}': [moment().subtract(29, 'days'), moment()],
-                    '{% trans "This Month" %}': [moment().startOf('month'), moment().endOf('month')],
-                    '{% trans "Last Month" %}': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
-                }
-            });
-
-            $('#filterupdated').on('apply.daterangepicker', function(ev, picker) {
-                $('#search-navbar').val(`updated:>=${picker.startDate.format('YYYY-MM-DD')} updated:<=${picker.endDate.format('YYYY-MM-DD')}`);
-                $('#search-navbar').closest('form').trigger('submit');
-            });
+            // Add the picker for all elements that need it
+            $.each(['#filterupdated', '#filtersubmitted'], (index, element) => {
+                $(element).daterangepicker({
+                    startDate: start,
+                    endDate: end,
+                    ranges: {
+                        '{% trans "Today" %}': [moment(), moment()],
+                        '{% trans "Yesterday" %}': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
+                        '{% trans "Last 7 Days" %}': [moment().subtract(6, 'days'), moment()],
+                        '{% trans "Last 30 Days" %}': [moment().subtract(29, 'days'), moment()],
+                        '{% trans "This Month" %}': [moment().startOf('month'), moment().endOf('month')],
+                        '{% trans "Last Month" %}': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
+                    }
+                });
+
+                var query = $(element).attr("data-query");
+
+                $(element).on('apply.daterangepicker', function(ev, picker) {
+                    $('#search-navbar').val(`${query}:>=${picker.startDate.format('YYYY-MM-DD')} ${query}:<=${picker.endDate.format('YYYY-MM-DD')}`);
+                    $('#search-navbar').closest('form').trigger('submit');
+                });
+            })
         });
     </script>
 {% endblock %}

hypha/apply/search/filters.py

@@ -14,6 +14,8 @@ def apply_date_filter(qs, field, values):
 
         if q := date_filter_tokens_to_q_obj(tokens=tokens, field=field):
             q_obj &= q
+        else:
+            return qs.none()
 
     return qs.filter(q_obj)
 
@@ -66,4 +68,4 @@ def date_filter_tokens_to_q_obj(tokens: list, field: str) -> Q:
                 return Q(**{f"{field}__year": year})
             else:
                 return Q(**{f"{field}__year": year})
-    return Q(None)
+    return None

hypha/apply/search/query_parser.py

@@ -87,6 +87,10 @@ def tokenize_date_filter_value(date_str: str) -> list:
     # Match the regex pattern to the value
     match = re.match(regex_pattern, date_str)
 
+    if match is None:
+        # Invalid date string
+        return []
+
     # Extract the operator and date from the match object
     operator = match.group(1)
     date_str = match.group(2)

hypha/apply/search/tests/test_filters.py

@@ -39,8 +39,8 @@
         (["<", 2023], "date_field", Q(date_field__year__lt=2023)),
         ([None, 2023], "date_field", Q(date_field__year=2023)),
         ([None, 2023], "date_field", Q(date_field__year=2023)),
-        ([], "date_field", Q(None)),
-        ([], "date_field", Q(None)),
+        ([], "date_field", None),
+        ([], "date_field", None),
     ],
 )
 def test_date_filter_tokens_to_q_obj(tokens, field, expected):