✨ #63 - feat: implement date (range) filters

maykinmedia · Jun 10, 2024 · 2cf5bfb · 2cf5bfb
1 parent 34d67b8
commit 2cf5bfb
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 18 deletions.
diff --git a/backend/src/openarchiefbeheer/zaken/api/filtersets.py b/backend/src/openarchiefbeheer/zaken/api/filtersets.py
@@ -99,7 +99,7 @@ class Meta:
             "uuid": ["exact", "icontains"],
             "url": ["exact", "icontains"],
             "status": ["exact", "icontains"],
-            "einddatum": ["exact", "gt", "lt", "isnull"],
+            "einddatum": ["exact", "gt", "lt", "gte", "lte", "isnull"],
             "hoofdzaak": ["exact", "icontains"],
             "startdatum": ["exact", "gt", "lt", "gte", "lte"],
             "toelichting": ["exact", "icontains"],

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@maykin-ui/admin-ui": "^0.0.8",
+    "@maykin-ui/admin-ui": "^0.0.10",
     "@storybook/test-runner": "^0.18.2",
     "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^13.4.0",

diff --git a/frontend/src/components/DestructionList/DestructionList.tsx b/frontend/src/components/DestructionList/DestructionList.tsx
@@ -159,6 +159,27 @@ export function DestructionList({
             explicit: true,
           },
           filterable: true,
+          filterTransform: (filterData: AttributeData) => {
+            console.log(filterData);
+            const {
+              startdatum = "",
+              einddatum = "",
+              ..._filterData
+            } = filterData;
+
+            const [startdatum__gte = "", startdatum__lte = ""] =
+              String(startdatum).split("/");
+            const [einddatum__gte = "", einddatum__lte = ""] =
+              String(einddatum).split("/");
+
+            return {
+              startdatum__gte,
+              startdatum__lte,
+              einddatum__gte,
+              einddatum__lte,
+              ..._filterData,
+            };
+          },
           page: Number(searchParams.get("page")) || 1,
           onFilter: onFilter,
           onFieldsChange: onFieldsChange,

diff --git a/frontend/src/pages/destructionlist/utils.ts b/frontend/src/pages/destructionlist/utils.ts
@@ -38,13 +38,11 @@ export function getFields(
     },
     {
       name: "startdatum",
-      type: "string", // TODO: Support date(range)
-      filterable: false, // TODO
+      type: "daterange",
     },
     {
       name: "einddatum",
-      type: "string", // TODO: Support date(range)
-      filterable: false, // TODO
+      type: "daterange",
     },
     {
       name: "zaaktype",