From 5bcfc8db752fce96e9f523d14cefff1a4f675661 Mon Sep 17 00:00:00 2001
From: Nicolai Ort <info@nicolai-ort.com>
Date: Wed, 19 Apr 2023 18:00:41 +0200
Subject: [PATCH] More filtering

---
 src/components/donors/DonorsOverview.svelte | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/donors/DonorsOverview.svelte b/src/components/donors/DonorsOverview.svelte
index 6c80a19d..b8bf2ef4 100644
--- a/src/components/donors/DonorsOverview.svelte
+++ b/src/components/donors/DonorsOverview.svelte
@@ -22,6 +22,7 @@
   import TableActions from "../shared/TableActions.svelte";
   import DonorAddress from "./DonorAddress.svelte";
   import DonorDonations from "./DonorDonations.svelte";
+  import { filterAddress, filterName } from "../shared/tablefilters";
   $: searchvalue = "";
   $: active_deletes = [];
   $: current_donations = [];
@@ -32,8 +33,6 @@
 
   $: dataLoaded = false;
 
-  let modal_open = false;
-  let delete_donor = {};
   export let current_donors = [];
   export const addDonors = (donors) => {
     current_donors = current_donors.concat(...donors);
@@ -61,7 +60,7 @@
           return `${d.firstname} ${d.lastname}`;
         }
       },
-      filterFn: `includesString`,
+      filterFn: `name`,
     },
     {
       accessorKey: "address",
@@ -69,7 +68,7 @@
       cell: (info) => {
         return renderComponent(DonorAddress, { address: info.getValue() });
       },
-      filterFn: `includesString`,
+      filterFn: `address`,
     },
     {
       accessorKey: "sponsorings",
@@ -131,6 +130,10 @@
         pageSize: 50,
       },
     },
+    filterFns: {
+      name: filterName,
+      address: filterAddress,
+    },
     enableRowSelection: true,
     getCoreRowModel: getCoreRowModel(),
     getFilteredRowModel: getFilteredRowModel(),