✨ #635 - feat: method to clear filters

backend/src/openarchiefbeheer/destruction/tests/e2e/issues/test_635_filters_reset.py

@@ -0,0 +1,33 @@
+# fmt: off
+from django.test import tag
+
+from openarchiefbeheer.destruction.constants import (
+    DestructionListItemAction,
+    InternalStatus,
+    ListStatus,
+)
+from openarchiefbeheer.utils.tests.e2e import browser_page
+from openarchiefbeheer.utils.tests.gherkin import GherkinLikeTestCase
+
+
+@tag("e2e")
+@tag("gh-635")
+class Issue635FiltersReset(GherkinLikeTestCase):
+    async def test_scenario_reset_button_works(self):
+        async with browser_page() as page:
+            zaken = await self.given.zaken_are_indexed(amount=6)
+            record_manager = await self.given.record_manager_exists()
+
+            await self.given.list_exists(
+                name="Destruction list to reset filters for",
+                status=ListStatus.ready_to_review,
+                zaken=zaken,
+            )
+
+            await self.when.user_logs_in(page, record_manager)
+            await self.then.path_should_be(page, "/destruction-lists")
+            await self.when.user_clicks_button(page, "Destruction list to reset filters for")
+            await self.when.user_filters_zaken(page, "omschrijving", "some text")
+            await self.then.url_should_contain_text(page, "omschrijving__icontains=")
+            await self.when.user_clicks_button(page, "Filters wissen")
+            await self.then.input_field_should_be_empty(page, "Omschrijving")

backend/src/openarchiefbeheer/utils/tests/gherkin.py

@@ -771,3 +771,7 @@ async def this_number_of_zaken_should_be_visible(self, page, number):
             rows = await locator.locator("tbody").locator("tr").all()
 
             self.testcase.assertEqual(len(rows), number)
+
+        async def input_field_should_be_empty(self, page, placeholder):
+            locator = page.get_by_placeholder(placeholder)
+            await expect(locator).to_have_value("")

frontend/src/hooks/useFields.ts

@@ -96,6 +96,7 @@ export function useFields<T extends Zaak = Zaak>(
     {
       name: "startdatum",
       type: "daterange",
+      filterLookup: "startdatum__gte,startdatum__lte",
       filterValue:
         searchParams.get("startdatum__gte") &&
         searchParams.get("startdatum__lte")
@@ -108,6 +109,7 @@ export function useFields<T extends Zaak = Zaak>(
     {
       name: "einddatum",
       type: "daterange",
+      filterLookup: "startdatum__gte,startdatum__lte",
       filterValue:
         searchParams.get("einddatum__gte") && searchParams.get("einddatum__lte")
           ? `${searchParams.get("einddatum__gte")}/${searchParams.get("einddatum__lte")}`

frontend/src/pages/destructionlist/abstract/BaseListView.tsx

@@ -109,7 +109,7 @@ export function BaseListView<T extends Zaak = Zaak>({
   type FilterTransformData = ReturnType<typeof filterTransform>;
 
   // Filter.
-  const [, setFilterField] = useFilter<FilterTransformData>();
+  const [setFilterField] = useFilter<FilterTransformData>();
 
   // Selection.
   const [
@@ -154,6 +154,19 @@ export function BaseListView<T extends Zaak = Zaak>({
     onClearZaakSelection?.();
   };
 
+  const resetFilters = () => {
+    const filterLookupValues = fields
+      .filter((field) => field.filterLookup)
+      .map((field) => field.filterLookup)
+      // We perform a `flatMap` to handle multiple filter lookups within one field
+      .flatMap((filterLookup) => filterLookup?.split(","));
+    const newSearchParams = new URLSearchParams(searchParams);
+    filterLookupValues.forEach((filterLookup) => {
+      if (!filterLookup) return;
+      newSearchParams.delete(filterLookup);
+    });
+    setSearchParams(newSearchParams);
+  };
   // Selection actions.
   const getSelectionActions = useCallback(() => {
     const disabled = selectable && hasSelection;
@@ -186,10 +199,7 @@ export function BaseListView<T extends Zaak = Zaak>({
       ),
       variant: "warning",
       wrap: false,
-      onClick: () => {
-        const pageParam = searchParams.get("page") || "1";
-        setSearchParams({ page: pageParam });
-      },
+      onClick: resetFilters,
     };
     return [...dynamicItems, ...fixedItems, clearFiltersItem];
   }, [selectable, hasSelection, selectedZakenOnPage, selectionActions]);