src/components/cards/CardsOverview.svelte

@@ -23,7 +23,6 @@
   import CardStatus from "./CardStatus.svelte";
   import CardRunner from "./CardRunner.svelte";
   import { onMount } from "svelte";
-  import { runnerFilter } from "../shared/tablefilters";
 
   export let edit_modal_open = false;
   export let runner = {};
@@ -48,11 +47,11 @@
     },
     {
       accessorKey: "runner",
-      header: () => $_("runner"),
+      header: () => $_("name"),
       cell: (info) => {
         return renderComponent(CardRunner, { runner: info.getValue() });
       },
-      filterFn: `runner`,
+      filterFn: `includesString`,
     },
     {
       accessorKey: "enabled",
@@ -97,9 +96,6 @@
         pageSize: 50,
       },
     },
-    filterFns: {
-      runner: runnerFilter,
-    },
     enableRowSelection: true,
     getCoreRowModel: getCoreRowModel(),
     getFilteredRowModel: getFilteredRowModel(),

src/components/scans/ScansOverview.svelte

@@ -19,7 +19,6 @@
   import ScansEmptyState from "./ScansEmptyState.svelte";
   import InputElement from "../shared/InputElement.svelte";
   import TableActions from "../shared/TableActions.svelte";
-  import { runnerFilter } from "../shared/tablefilters";
 
   $: selectedScans =
     $table?.getSelectedRowModel().rows.map((row) => row.original) || [];
@@ -76,7 +75,6 @@
         const runner = info.getValue();
         return `#${runner.id} - ${runner.firstname} ${runner.lastname}`;
       },
-      filterFn: `runner`,
       enableColumnFilter: true,
     },
     {
@@ -135,9 +133,6 @@
         pageSize: 50,
       },
     },
-    filterFns: {
-      runner: runnerFilter,
-    },
     enableRowSelection: true,
     getCoreRowModel: getCoreRowModel(),
     getFilteredRowModel: getFilteredRowModel(),

src/components/shared/tablefilters.js

@@ -13,17 +13,3 @@ export const groupFilter = (row, columnId, value) => {
         );
     }
 };
-export const runnerFilter = (row, columnId, value) => {
-    const runner = row.getValue(columnId);
-    if(!runner && value == "blanko"){return true}
-    if(!runner){return false}
-
-    if(value.startsWith("#")){
-        return runner.id == value.replace("#","")
-    }
-
-    if(runner.middlename){
-        return `${runner.firstname} ${runner.middlename} ${runner.lastname}`.toLowerCase().includes(value.toLowerCase())
-    }
-    return `${runner.firstname} ${runner.lastname}`.toLowerCase().includes(value.toLowerCase())
-};